texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Converter.pm (set_tree_unit_


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Converter.pm (set_tree_unit_file) (_set_tree_units_files, output, _convert_document_tree_units), tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm (set_tree_unit_file, _set_tree_units_files) (_convert_document_tree_units, _default_format_element_header) (element_is_tree_unit_top, _default_format_element_header) (_convert_heading_command, _convert_tree_unit_type) (_html_get_tree_unit, _html_set_pages_files) (_prepare_tree_units_global_targets), tp/Texinfo/Conver [...]
Date: Wed, 08 Sep 2021 06:43:49 -0400

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 40264a3  * tp/Texinfo/Convert/Converter.pm (set_tree_unit_file) 
(_set_tree_units_files, output, _convert_document_tree_units), 
tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm (set_tree_unit_file, 
_set_tree_units_files) (_convert_document_tree_units, 
_default_format_element_header) (element_is_tree_unit_top, 
_default_format_element_header) (_convert_heading_command, 
_convert_tree_unit_type) (_html_get_tree_unit, _html_set_pages_files) 
(_prepare_tree_units_global_targets) [...]
40264a3 is described below

commit 40264a3ac0d545626d5d71a0129c13911500d55d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 8 12:43:36 2021 +0200

    * tp/Texinfo/Convert/Converter.pm (set_tree_unit_file)
    (_set_tree_units_files, output, _convert_document_tree_units),
    tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm
    (set_tree_unit_file, _set_tree_units_files)
    (_convert_document_tree_units, _default_format_element_header)
    (element_is_tree_unit_top, _default_format_element_header)
    (_convert_heading_command, _convert_tree_unit_type)
    (_html_get_tree_unit, _html_set_pages_files)
    (_prepare_tree_units_global_targets),
    tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/Plaintext.pm,
    tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Structuring.pm
    (split_by_node, split_by_section, elements_file_directions),
    tp/init/book.pm, tp/init/chm.pm, tp/t/init/mini_ker_t2h.init,
    tp/t/init/misc_file_collision.init, tp/t/init/t2h_singular.init:
    Rename element as tree_unit when it corresponds to the
    section and associated node tree element, such that
    element can be used for any tree element.
    Rename the corresponding type as unit and associated
    element extra fields.
    In Texinfo::Convert::Converter, rename _set_element_file()
    as set_tree_unit_file(), _set_pages_files() as _set_tree_units_files()
    and _convert_document_elements() as _convert_document_tree_units().
    In Texinfo::Convert::HTML, rename command_element_command() as
    command_tree_unit_command(), element_is_top() as
    element_is_tree_unit_top(), _convert_element_type() as
    _convert_tree_unit_type(), _get_element() as _html_get_tree_unit(),
    _set_html_pages_files() as _html_set_pages_files(),
    _prepare_global_targets() as _prepare_tree_units_global_targets()
---
 ChangeLog                                          |  31 ++
 tp/Texinfo/Convert/Converter.pm                    | 168 ++++----
 tp/Texinfo/Convert/DocBook.pm                      |  12 +-
 tp/Texinfo/Convert/HTML.pm                         | 473 +++++++++++----------
 tp/Texinfo/Convert/IXIN.pm                         |  14 +-
 tp/Texinfo/Convert/Plaintext.pm                    |   2 +-
 tp/Texinfo/Convert/TexinfoXML.pm                   |  38 +-
 tp/Texinfo/Structuring.pm                          | 265 ++++++------
 tp/init/book.pm                                    |  72 ++--
 tp/init/chm.pm                                     |  14 +-
 tp/t/init/mini_ker_t2h.init                        |  16 +-
 tp/t/init/misc_file_collision.init                 |   6 +-
 tp/t/init/t2h_singular.init                        |  14 +-
 .../html_tests/footnotestyle_separate_late.pl      |  62 +--
 tp/t/results/html_tests/index_below.pl             |  56 +--
 tp/t/results/html_tests/redirection_same_labels.pl |  74 ++--
 .../sectioning/chapter_before_and_after_part.pl    |  36 +-
 tp/t/results/sectioning/chapter_before_part.pl     |  36 +-
 tp/t/results/sectioning/chapter_sections.pl        | 156 +++----
 .../sectioning/character_and_spaces_in_refs_out.pl | 238 +++++------
 tp/t/results/sectioning/complex.pl                 | 292 ++++++-------
 tp/t/results/sectioning/complex_split_at_node.pl   | 374 ++++++++--------
 tp/t/results/sectioning/double_part.pl             |  90 ++--
 .../results/sectioning/explicit_node_directions.pl |  66 +--
 tp/t/results/sectioning/internal_top_node_up.pl    |  40 +-
 tp/t/results/sectioning/lone_Top_node.pl           |  30 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |  88 ++--
 .../sectioning/node_part_chapter_after_top.pl      |  66 +--
 tp/t/results/sectioning/node_up_external_node.pl   |  40 +-
 .../nodes_after_top_before_chapter_nodes.pl        |  68 +--
 .../nodes_after_top_before_chapter_sections.pl     |  30 +-
 .../nodes_after_top_before_section_nodes.pl        |  68 +--
 .../nodes_after_top_before_section_sections.pl     |  30 +-
 .../nodes_no_node_top_explicit_directions.pl       |  40 +-
 .../non_automatic_internal_top_node_up.pl          |  40 +-
 .../non_automatic_top_node_up_and_url.pl           |  40 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |  40 +-
 tp/t/results/sectioning/part_before_chapter.pl     |  16 +-
 tp/t/results/sectioning/part_before_section.pl     |  16 +-
 tp/t/results/sectioning/part_before_top.pl         |  16 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |  66 +--
 tp/t/results/sectioning/part_node_after_top.pl     |  48 +--
 tp/t/results/sectioning/part_node_before_top.pl    |  42 +-
 .../sectioning/part_node_chapter_after_top.pl      |  66 +--
 .../sectioning/part_node_chapter_appendix.pl       |  86 ++--
 .../sectioning/part_node_chapter_node_appendix.pl  |  74 ++--
 .../sectioning/part_node_node_part_appendix.pl     |  88 ++--
 tp/t/results/sectioning/part_node_part_appendix.pl |  86 ++--
 .../sectioning/part_node_part_node_appendix.pl     |  88 ++--
 .../results/sectioning/sectioning_part_appendix.pl | 196 ++++-----
 .../sectioning/sectioning_part_appendix_no_top.pl  | 176 ++++----
 tp/t/results/sectioning/top_chapter_sections.pl    | 176 ++++----
 tp/t/results/sectioning/top_node_part_top.pl       |  30 +-
 tp/t/results/sectioning/top_node_up_url.pl         |  40 +-
 tp/t/results/sectioning/top_part_chapter.pl        |  36 +-
 tp/t/results/sectioning/top_without_node_nodes.pl  |  18 +-
 .../sectioning/top_without_node_sections.pl        |  50 +--
 .../transliterated_split_equivalent_nodes.pl       |  92 ++--
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  52 +--
 .../sectioning/two_nodes_between_chapters.pl       |  74 ++--
 .../sectioning/unnumbered_before_node_top_top.pl   |  48 +--
 .../sectioning/unnumbered_before_top_node.pl       |  16 +-
 .../unnumbered_top_without_node_nodes.pl           |  40 +-
 .../unnumbered_top_without_node_sections.pl        |  82 ++--
 tp/t/results/xml_tests/node_and_bye.pl             |   8 +-
 tp/t/test_utils.pl                                 |   4 +-
 66 files changed, 2551 insertions(+), 2504 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f574ff7..c6b49fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
 2021-09-08  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/Converter.pm (set_tree_unit_file)
+       (_set_tree_units_files, output, _convert_document_tree_units),
+       tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm
+       (set_tree_unit_file, _set_tree_units_files)
+       (_convert_document_tree_units, _default_format_element_header)
+       (element_is_tree_unit_top, _default_format_element_header)
+       (_convert_heading_command, _convert_tree_unit_type)
+       (_html_get_tree_unit, _html_set_pages_files)
+       (_prepare_tree_units_global_targets),
+       tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/Plaintext.pm,
+       tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Structuring.pm
+       (split_by_node, split_by_section, elements_file_directions),
+       tp/init/book.pm, tp/init/chm.pm, tp/t/init/mini_ker_t2h.init,
+       tp/t/init/misc_file_collision.init, tp/t/init/t2h_singular.init:
+       Rename element as tree_unit when it corresponds to the
+       section and associated node tree element, such that
+       element can be used for any tree element.
+       Rename the corresponding type as unit and associated
+       element extra fields.
+       In Texinfo::Convert::Converter, rename _set_element_file()
+       as set_tree_unit_file(), _set_pages_files() as _set_tree_units_files()
+       and _convert_document_elements() as _convert_document_tree_units().
+       In Texinfo::Convert::HTML, rename command_element_command() as
+       command_tree_unit_command(), element_is_top() as
+       element_is_tree_unit_top(), _convert_element_type() as
+       _convert_tree_unit_type(), _get_element() as _html_get_tree_unit(),
+       _set_html_pages_files() as _html_set_pages_files(),
+       _prepare_global_targets() as _prepare_tree_units_global_targets()
+
+2021-09-08  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Convert/Converter.pm (node_information_filename),
        tp/Texinfo/Convert/HTML.pm: rename _node_filename() as
        node_information_filename().
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index a1e589d..54dced0 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -547,15 +547,15 @@ sub node_information_filename($$)
   return $filename;
 }
 
-sub _set_element_file($$$$)
+sub set_tree_unit_file($$$$)
 {
   my $self = shift;
-  my $element = shift;
+  my $tree_unit = shift;
   my $filename = shift;
   my $destination_directory = shift;
 
   if (!defined($filename)) {
-    cluck("_set_element_file: filename not defined\n");
+    cluck("set_tree_unit_file: filename not defined\n");
   }
   if ($self->get_conf('CASE_INSENSITIVE_FILENAMES')) {
     if (exists($self->{'filenames'}->{lc($filename)})) {
@@ -568,12 +568,12 @@ sub _set_element_file($$$$)
       $self->{'filenames'}->{lc($filename)} = $filename;
     }
   }
-  $element->{'filename'} = $filename;
+  $tree_unit->{'filename'} = $filename;
   if (defined($destination_directory) and $destination_directory ne '') {
-    $element->{'out_filename'} = 
+    $tree_unit->{'out_filename'} =
       File::Spec->catfile($destination_directory, $filename);
   } else {
-    $element->{'out_filename'} = $filename;
+    $tree_unit->{'out_filename'} = $filename;
   }
 }
 
@@ -610,7 +610,7 @@ sub _get_element($$)
 
   while (1) {
     if ($current->{'type'}) {
-      if ($current->{'type'} eq 'element') {
+      if ($current->{'type'} eq 'unit') {
         return $current;
       }
     }
@@ -622,17 +622,17 @@ sub _get_element($$)
   }
 }
 
-sub _set_pages_files($$$$$$)
+sub _set_tree_units_files($$$$$$)
 {
   my $self = shift;
-  my $elements = shift;
+  my $tree_units = shift;
   my $output_file = shift;
   my $destination_directory = shift;
   my $output_filename = shift;
   my $document_name = shift;
 
   # Ensure that the document has pages
-  return undef if (!defined($elements) or !@$elements);
+  return undef if (!defined($tree_units) or !@$tree_units);
 
   my $extension = '';
   $extension = '.'.$self->get_conf('EXTENSION') 
@@ -640,10 +640,10 @@ sub _set_pages_files($$$$$$)
                 and $self->get_conf('EXTENSION') ne '');
 
   if (!$self->get_conf('SPLIT')) {
-    foreach my $element (@$elements) {
-      if (!defined($element->{'filename'})) {
-        $element->{'filename'} = $output_filename;
-        $element->{'out_filename'} = $output_file;
+    foreach my $tree_unit (@$tree_units) {
+      if (!defined($tree_unit->{'filename'})) {
+        $tree_unit->{'filename'} = $output_filename;
+        $tree_unit->{'out_filename'} = $output_file;
       }
     }
   } else {
@@ -653,22 +653,22 @@ sub _set_pages_files($$$$$$)
     my $top_node_filename = $self->top_node_filename($document_name);
     # first determine the top node file name.
     if ($node_top and defined($top_node_filename)) {
-      my ($node_top_element) = $self->_get_element($node_top);
+      my ($node_top_unit) = $self->_get_element($node_top);
       die "BUG: No element for top node" if (!defined($node_top));
-      $self->_set_element_file($node_top_element, $top_node_filename,
-                               $destination_directory);
+      $self->set_tree_unit_file($node_top_unit, $top_node_filename,
+                                $destination_directory);
     }
     my $file_nr = 0;
     my $previous_page;
-    foreach my $element(@$elements) {
+    foreach my $tree_unit (@$tree_units) {
       # For Top node.
-      next if (defined($element->{'filename'}));
-      if (!$element->{'extra'}->{'first_in_page'}) {
-        cluck ("No first_in_page for $element\n");
+      next if (defined($tree_unit->{'filename'}));
+      if (!$tree_unit->{'extra'}->{'first_in_page'}) {
+        cluck ("No first_in_page for $tree_unit\n");
       }
-      if (!defined($element->{'extra'}->{'first_in_page'}->{'filename'})) {
-        my $file_element = $element->{'extra'}->{'first_in_page'};
-        foreach my $root_command (@{$file_element->{'contents'}}) {
+      if (!defined($tree_unit->{'extra'}->{'first_in_page'}->{'filename'})) {
+        my $file_tree_unit = $tree_unit->{'extra'}->{'first_in_page'};
+        foreach my $root_command (@{$file_tree_unit->{'contents'}}) {
           if ($root_command->{'cmdname'} 
               and $root_command->{'cmdname'} eq 'node') {
             my $node_filename;
@@ -681,51 +681,51 @@ sub _set_pages_files($$$$$$)
                = $self->node_information_filename($root_command->{'extra'});
             }
             $node_filename .= $extension;
-            $self->_set_element_file($file_element, $node_filename,
-                                     $destination_directory);
+            $self->set_tree_unit_file($file_tree_unit, $node_filename,
+                                      $destination_directory);
             last;
           }
         }
-        if (!defined($file_element->{'filename'})) {
+        if (!defined($file_tree_unit->{'filename'})) {
           # use section to do the file name if there is no node
-          my $command = $file_element->{'extra'}->{'element_command'};
+          my $command = $file_tree_unit->{'extra'}->{'unit_command'};
           if ($command) {
             if ($command->{'cmdname'} eq 'top' and !$node_top
                 and defined($top_node_filename)) {
-              $self->_set_element_file($file_element, $top_node_filename,
-                                       $destination_directory);
+              $self->set_tree_unit_file($file_tree_unit, $top_node_filename,
+                                        $destination_directory);
             } else {
               my ($normalized_name, $filename) 
                  = $self->normalized_sectioning_command_filename($command);
-              $self->_set_element_file($file_element, $filename,
-                                       $destination_directory);
+              $self->set_tree_unit_file($file_tree_unit, $filename,
+                                        $destination_directory);
             }
           } else {
             # when everything else has failed
             if ($file_nr == 0 and !$node_top 
                 and defined($top_node_filename)) {
-              $self->_set_element_file($file_element, $top_node_filename,
-                                       $destination_directory);
+              $self->set_tree_unit_file($file_tree_unit, $top_node_filename,
+                                        $destination_directory);
             } else {
               my $filename = $document_name . "_$file_nr";
               $filename .= $extension;
-              $self->_set_element_file($element, $filename,
-                                       $destination_directory);
+              $self->set_tree_unit_file($tree_unit, $filename,
+                                        $destination_directory);
             }
             $file_nr++;
           }
         }
       }
-      $element->{'filename'} 
-         = $element->{'extra'}->{'first_in_page'}->{'filename'};
-      $element->{'out_filename'}
-         = $element->{'extra'}->{'first_in_page'}->{'out_filename'};
+      $tree_unit->{'filename'}
+         = $tree_unit->{'extra'}->{'first_in_page'}->{'filename'};
+      $tree_unit->{'out_filename'}
+         = $tree_unit->{'extra'}->{'first_in_page'}->{'out_filename'};
     }
   }
 
-  foreach my $element (@$elements) {
-    $self->{'file_counters'}->{$element->{'filename'}}++;
-    print STDERR "Page $element 
".Texinfo::Structuring::_print_element_command_texi($element).": 
$element->{'filename'}($self->{'file_counters'}->{$element->{'filename'}})\n"
+  foreach my $tree_unit (@$tree_units) {
+    $self->{'file_counters'}->{$tree_unit->{'filename'}}++;
+    print STDERR "Page $tree_unit 
".Texinfo::Structuring::_print_element_command_texi($tree_unit).": 
$tree_unit->{'filename'}($self->{'file_counters'}->{$tree_unit->{'filename'}})\n"
       if ($self->get_conf('DEBUG'));
   }
 }
@@ -738,7 +738,7 @@ sub output($$)
   my $self = shift;
   my $root = shift;
 
-  my $elements;
+  my $tree_units;
 
   if (defined($self->get_conf('OUTFILE'))
       and ($Texinfo::Common::null_device_file{$self->get_conf('OUTFILE')}
@@ -762,25 +762,25 @@ sub output($$)
   return undef unless $succeeded;
 
   if ($self->get_conf('USE_NODES')) {
-    $elements = Texinfo::Structuring::split_by_node($root);
+    $tree_units = Texinfo::Structuring::split_by_node($root);
   } else {
-    $elements = Texinfo::Structuring::split_by_section($root);
+    $tree_units = Texinfo::Structuring::split_by_section($root);
   }
 
-  Texinfo::Structuring::split_pages($elements, $self->get_conf('SPLIT'));
+  Texinfo::Structuring::split_pages($tree_units, $self->get_conf('SPLIT'));
 
   # determine file names associated with the different pages
   if ($output_file ne '') {
-    $self->_set_pages_files($elements, $output_file, $destination_directory,
-                            $output_filename, $document_name);
+    $self->_set_tree_units_files($tree_units, $output_file, 
$destination_directory,
+                                 $output_filename, $document_name);
   }
 
-  #print STDERR "$elements $elements->[0]->{'filename'}\n";
+  #print STDERR "$tree_units $tree_units->[0]->{'filename'}\n";
 
   # Now do the output
   my $fh;
   my $output = '';
-  if (!$elements or !defined($elements->[0]->{'filename'})) {
+  if (!$tree_units or !defined($tree_units->[0]->{'filename'})) {
     # no page
     my $outfile;
     if ($output_file ne '') {
@@ -807,10 +807,10 @@ sub output($$)
         if ($self->get_conf('DEBUG'));
     }
 
-    if ($elements and @$elements) {
-      foreach my $element (@$elements) {
-        my $element_text = $self->convert_tree($element);
-        $output .= $self->write_or_return($element_text, $fh);
+    if ($tree_units and @$tree_units) {
+      foreach my $tree_unit (@$tree_units) {
+        my $tree_unit_text = $self->convert_tree($tree_unit);
+        $output .= $self->write_or_return($tree_unit_text, $fh);
       }
     } else {
       $output .= $self->write_or_return($self->convert($root), $fh);
@@ -832,35 +832,35 @@ sub output($$)
       if ($self->get_conf('DEBUG'));
     my %files;
     
-    foreach my $element (@$elements) {
+    foreach my $tree_unit (@$tree_units) {
       my $file_fh;
       # open the file and output the elements
-      if (!$files{$element->{'filename'}}->{'fh'}) {
+      if (!$files{$tree_unit->{'filename'}}->{'fh'}) {
         $file_fh = Texinfo::Common::output_files_open_out(
                              $self->output_files_information(), $self,
-                             $element->{'out_filename'});
+                             $tree_unit->{'out_filename'});
         if (!$file_fh) {
           $self->document_error($self,
                 sprintf(__("could not open %s for writing: %s"),
-                                    $element->{'out_filename'}, $!));
+                                    $tree_unit->{'out_filename'}, $!));
           return undef;
         }
-        $files{$element->{'filename'}}->{'fh'} = $file_fh;
+        $files{$tree_unit->{'filename'}}->{'fh'} = $file_fh;
       } else {
-        $file_fh = $files{$element->{'filename'}}->{'fh'};
+        $file_fh = $files{$tree_unit->{'filename'}}->{'fh'};
       }
-      my $element_text = $self->convert_tree($element);
-      print $file_fh $element_text;
-      $self->{'file_counters'}->{$element->{'filename'}}--;
-      if ($self->{'file_counters'}->{$element->{'filename'}} == 0) {
+      my $tree_unit_text = $self->convert_tree($tree_unit);
+      print $file_fh $tree_unit_text;
+      $self->{'file_counters'}->{$tree_unit->{'filename'}}--;
+      if ($self->{'file_counters'}->{$tree_unit->{'filename'}} == 0) {
         # NOTE do not close STDOUT here to avoid a perl warning
-        if ($element->{'out_filename'} ne '-') {
+        if ($tree_unit->{'out_filename'} ne '-') {
           Texinfo::Common::output_files_register_closed(
-            $self->output_files_information(), $element->{'out_filename'});
+            $self->output_files_information(), $tree_unit->{'out_filename'});
           if (!close($file_fh)) {
             $self->document_error($self,
                      sprintf(__("error on closing %s: %s"),
-                                  $element->{'out_filename'}, $!));
+                                  $tree_unit->{'out_filename'}, $!));
             return undef;
           }
         }
@@ -1259,17 +1259,17 @@ sub write_or_return($$$)
   } 
 }
 
-sub _convert_document_elements($$;$$)
+sub _convert_document_tree_units($$;$$)
 {
   my $self = shift;
   my $root = shift;
-  my $elements = shift;
+  my $tree_units = shift;
   my $fh = shift;
 
-  if ($elements) {
+  if ($tree_units) {
     my $result = '';
-    foreach my $element (@$elements) {
-      $result .= $self->write_or_return($self->convert_tree($element), $fh);
+    foreach my $tree_unit (@$tree_units) {
+      $result .= $self->write_or_return($self->convert_tree($tree_unit), $fh);
     }
     return $result;
   } else {
@@ -1283,8 +1283,8 @@ sub convert_document_sections($$;$)
   my $root = shift;
   my $fh = shift;
 
-  my $elements = Texinfo::Structuring::split_by_section($root);
-  return $self->_convert_document_elements($root, $elements, $fh);
+  my $tree_units = Texinfo::Structuring::split_by_section($root);
+  return $self->_convert_document_tree_units($root, $tree_units, $fh);
 }
 
 sub convert_document_nodes($$;$)
@@ -1293,8 +1293,8 @@ sub convert_document_nodes($$;$)
   my $root = shift;
   my $fh = shift;
 
-  my $elements = Texinfo::Structuring::split_by_node($root);
-  return $self->_convert_document_elements($root, $elements, $fh);
+  my $tree_units = Texinfo::Structuring::split_by_node($root);
+  return $self->_convert_document_tree_units($root, $tree_units, $fh);
 }
 
 # if in this container, we are 'inline', within a running text
@@ -1428,7 +1428,7 @@ sub sort_element_counts($$;$$)
 
   if (!$elements) {
     @$elements = ($tree);
-  } elsif (scalar(@$elements) >= 1 
+  } elsif (scalar(@$elements) >= 1
            and (!$elements->[0]->{'extra'}->{'node'}
                 and !$elements->[0]->{'extra'}->{'section'})) {
     shift @$elements;
@@ -1439,10 +1439,10 @@ sub sort_element_counts($$;$$)
 
   require Texinfo::Convert::Texinfo;
   foreach my $element (@$elements) {
-    my $name = 'UNNAMED element';
-    if ($element->{'extra'} 
+    my $name = 'UNNAMED tree element';
+    if ($element->{'extra'}
         and ($element->{'extra'}->{'node'} or 
$element->{'extra'}->{'section'})) {
-      my $command = $element->{'extra'}->{'element_command'};
+      my $command = $element->{'extra'}->{'unit_command'};
       if ($command->{'cmdname'} eq 'node') {
         $name = Texinfo::Convert::Texinfo::convert_to_texinfo({'contents' 
           => $command->{'extra'}->{'nodes_manuals'}->[0]->{'node_content'}});
@@ -1453,12 +1453,12 @@ sub sort_element_counts($$;$$)
     }
     chomp($name);
     my $count;
-    my $element_content = $converter->convert_tree($element);
+    my $converted_element = $converter->convert_tree($element);
     if ($count_words) {
-      my @res = split /\W+/, $element_content;
+      my @res = split /\W+/, $converted_element;
       $count = scalar(@res);
     } else {
-      my @res = split /^/, $element_content;
+      my @res = split /^/, $converted_element;
       $count = scalar(@res);
     }
     push @name_counts_array, [$count, $name];
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 568c680..5db4df3 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1464,17 +1464,17 @@ sub _convert($$;$)
   # The command is closed either when the corresponding tree element
   # is done, and the command is not associated to an element, or when
   # the element is closed.
-  } elsif (($root->{'type'} and $root->{'type'} eq 'element'
-            and $root->{'extra'} and $root->{'extra'}->{'element_command'})
+  } elsif (($root->{'type'} and $root->{'type'} eq 'unit'
+            and $root->{'extra'} and $root->{'extra'}->{'unit_command'})
            or ($root->{'cmdname'} 
                and $Texinfo::Common::root_commands{$root->{'cmdname'}}
                and $root->{'cmdname'} ne 'node'
                and !($root->{'parent'} and $root->{'parent'}->{'type'}
-                     and $root->{'parent'}->{'type'} eq 'element'
+                     and $root->{'parent'}->{'type'} eq 'unit'
                      and $root->{'parent'}->{'extra'} 
-                     and $root->{'parent'}->{'extra'}->{'element_command'} eq 
$root))) {
-    if ($root->{'type'} and $root->{'type'} eq 'element') {
-      $root = $root->{'extra'}->{'element_command'};
+                     and $root->{'parent'}->{'extra'}->{'unit_command'} eq 
$root))) {
+    if ($root->{'type'} and $root->{'type'} eq 'unit') {
+      $root = $root->{'extra'}->{'unit_command'};
     }
     my $command = $self->_docbook_section_element($root);
     if ($command eq 'part' and !Texinfo::Common::is_content_empty($root)) {
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 2f86756..1abbaca 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -329,15 +329,15 @@ sub command_filename($$)
     if (defined($target->{'filename'})) {
       return $target->{'filename'};
     }
-    my ($element, $root_command) = $self->_get_element($command, 1);
+    my ($tree_unit, $root_command) = $self->_html_get_tree_unit($command, 1);
 
     if (defined($root_command)) {
       $target->{'root_command'} = $root_command;
     }
-    if (defined($element)) {
-      $target->{'element'} = $element;
-      $target->{'filename'} = $element->{'filename'};
-      return $element->{'filename'};
+    if (defined($tree_unit)) {
+      $target->{'unit'} = $tree_unit;
+      $target->{'filename'} = $tree_unit->{'filename'};
+      return $tree_unit->{'filename'};
     }
   }
   return undef;
@@ -351,20 +351,19 @@ sub command_element($$)
   my $target = $self->_get_target($command);
   if ($target) {
     $self->command_filename($command);
-    return $target->{'element'};
+    return $target->{'unit'};
   }
   return undef;
 }
 
-sub command_element_command($$)
+sub command_tree_unit_command($$)
 {
   my $self = shift;
   my $command = shift;
 
-  my ($element, $root_command) = $self->_get_element($command);
-  #my $element = $self->command_element($command);
-  if ($element and $element->{'extra'}) {
-    return $element->{'extra'}->{'element_command'};
+  my ($tree_unit, $root_command) = $self->_html_get_tree_unit($command);
+  if ($tree_unit and $tree_unit->{'extra'}) {
+    return $tree_unit->{'extra'}->{'unit_command'};
   }
   return undef;
 }
@@ -375,8 +374,8 @@ sub element_command($$)
   my $element = shift;
 
   if ($element and $element->{'extra'}) {
-    if ($element->{'extra'}->{'element_command'}) {
-      return $element->{'extra'}->{'element_command'};
+    if ($element->{'extra'}->{'unit_command'}) {
+      return $element->{'extra'}->{'unit_command'};
     } elsif ($element->{'extra'}->{'special_element'}) {
       return $element;
     }
@@ -428,10 +427,10 @@ sub command_href($$;$$)
     # Happens if there are no pages, for example if OUTPUT is set to ''
     # as in the test cases.  Also for things in @titlepage when
     # titlepage is not output.
-    if ($self->{'elements'} and $self->{'elements'}->[0]
-       and defined($self->{'elements'}->[0]->{'filename'})) {
+    if ($self->{'tree_units'} and $self->{'tree_units'}->[0]
+       and defined($self->{'tree_units'}->[0]->{'filename'})) {
       # In that case use the first page.
-      $target_filename = $self->{'elements'}->[0]->{'filename'};
+      $target_filename = $self->{'tree_units'}->[0]->{'filename'};
     }
   }
   if (defined($target_filename)) { 
@@ -440,13 +439,13 @@ sub command_href($$;$$)
       $href .= $target_filename;
       # omit target if the command is an element command, there is only
       # one element in file and there is a file in the href
-      my $command_element_command = $self->command_element_command($command);
+      my $command_tree_unit_command = 
$self->command_tree_unit_command($command);
       if (defined($filename)
-          and defined($command_element_command)
-          and ($command_element_command eq $command
-            or (defined($command_element_command->{'extra'})
-              and 
defined($command_element_command->{'extra'}->{'associated_section'})
-              and $command_element_command->{'extra'}->{'associated_section'}
+          and defined($command_tree_unit_command)
+          and ($command_tree_unit_command eq $command
+            or (defined($command_tree_unit_command->{'extra'})
+              and 
defined($command_tree_unit_command->{'extra'}->{'associated_section'})
+              and $command_tree_unit_command->{'extra'}->{'associated_section'}
                     eq $command))) {
         my $count_elements_in_file = 
$self->count_elements_in_filename($target_filename);
         if (defined($count_elements_in_file) and $count_elements_in_file == 1) 
{
@@ -648,17 +647,17 @@ sub global_element($$)
 
 # it is considered 'top' only if element corresponds to @top or 
 # element is a node
-sub element_is_top($$)
+sub element_is_tree_unit_top($$)
 {
   my $self = shift;
   my $element = shift;
   return ($self->{'global_target_elements'}->{'Top'}
     and $self->{'global_target_elements'}->{'Top'} eq $element
     and $element->{'extra'}
-    and (($element->{'extra'}->{'section'} 
+    and (($element->{'extra'}->{'section'}
          and $element->{'extra'}->{'section'}->{'cmdname'} eq 'top')
-         or ($element->{'extra'}->{'element_command'}
-             and $element->{'extra'}->{'element_command'}->{'cmdname'} eq 
'node')));
+         or ($element->{'extra'}->{'unit_command'}
+             and $element->{'extra'}->{'unit_command'}->{'cmdname'} eq 
'node')));
 }
 
 sub default_formatting_function($$)
@@ -1992,13 +1991,15 @@ sub _default_format_protect_text($$) {
   return $result;
 }
 
+# can be called on root commands, tree units, special elements
+# and title elements
 sub _default_format_heading_text($$$$$)
 {
   my $self = shift;
   my $cmdname = shift;
   my $text = shift;
   my $level = shift;
-  my $command = shift;
+  my $element = shift;
 
   return '' if ($text !~ /\S/);
 
@@ -2300,12 +2301,13 @@ sub _default_format_button($$)
   return ($active, $passive, $need_delimiter);
 }
 
+# called for special elements and tree units
 sub _default_format_navigation_header_panel($$$$;$)
 {
   my $self = shift;
   my $buttons = shift;
   my $cmdname = shift;
-  my $command = shift;
+  my $element = shift;
   my $vertical = shift;
 
   # if VERTICAL_HEAD_NAVIGATION, the buttons are in a vertical table which
@@ -2368,7 +2370,7 @@ sub _default_format_navigation_header($$$$)
   my $self = shift;
   my $buttons = shift;
   my $cmdname = shift;
-  my $command = shift;
+  my $element = shift;
 
   my $result = '';
   if ($self->get_conf('VERTICAL_HEAD_NAVIGATION')) {
@@ -2378,7 +2380,7 @@ sub _default_format_navigation_header($$$$)
 ';
   }
   $result .= &{$self->{'format_navigation_header_panel'}}($self, $buttons,
-                                                   $cmdname, $command,
+                                                   $cmdname, $element,
                                    
$self->get_conf('VERTICAL_HEAD_NAVIGATION'));
   if ($self->get_conf('VERTICAL_HEAD_NAVIGATION')) {
     $result .= '</td>
@@ -2390,30 +2392,31 @@ sub _default_format_navigation_header($$$$)
   return $result;
 }
 
+# this can only be called on root commands and associated tree units
 sub _default_format_element_header($$$$)
 {
   my $self = shift;
   my $cmdname = shift;
   my $command = shift;
-  my $element = shift;
+  my $tree_unit = shift;
 
   my $result = '';
     
-  print STDERR "Element $element (@{$element->{'contents'}}) ".
-     Texinfo::Structuring::_print_element_command_texi($element) ."\n"
+  print STDERR "Element $tree_unit (@{$tree_unit->{'contents'}}) ".
+     Texinfo::Structuring::_print_element_command_texi($tree_unit) ."\n"
         if ($self->get_conf('DEBUG'));
 
   # Do the heading if the command is the first command in the element
-  if (($element->{'contents'}->[0] eq $command
-       or (!$element->{'contents'}->[0]->{'cmdname'} 
-            and $element->{'contents'}->[1] eq $command))
+  if (($tree_unit->{'contents'}->[0] eq $command
+       or (!$tree_unit->{'contents'}->[0]->{'cmdname'}
+            and $tree_unit->{'contents'}->[1] eq $command))
       # and there is more than one element
-      and ($element->{'element_next'} or $element->{'element_prev'})) {
-    my $is_top = $self->element_is_top($element);
-    my $first_in_page = (defined($element->{'filename'})
-           and $self->{'counter_in_file'}->{$element->{'filename'}} == 1);
-    my $previous_is_top = ($element->{'element_prev'} 
-                   and $self->element_is_top($element->{'element_prev'}));
+      and ($tree_unit->{'unit_next'} or $tree_unit->{'unit_prev'})) {
+    my $is_top = $self->element_is_tree_unit_top($tree_unit);
+    my $first_in_page = (defined($tree_unit->{'filename'})
+           and $self->{'counter_in_file'}->{$tree_unit->{'filename'}} == 1);
+    my $previous_is_top = ($tree_unit->{'unit_prev'}
+                   and 
$self->element_is_tree_unit_top($tree_unit->{'unit_prev'}));
 
     print STDERR "Header ($previous_is_top, $is_top, $first_in_page): "
       .Texinfo::Structuring::_print_root_command_texi($command)."\n"
@@ -2527,26 +2530,26 @@ sub _convert_heading_command($$$$$)
   print STDERR "Process $command "
         .Texinfo::Structuring::_print_root_command_texi($command)."\n"
           if ($self->get_conf('DEBUG'));
-  my $element;
+  my $tree_unit;
   if ($Texinfo::Common::root_commands{$command->{'cmdname'}} 
       and $command->{'parent'}
       and $command->{'parent'}->{'type'} 
-      and $command->{'parent'}->{'type'} eq 'element') {
-    $element = $command->{'parent'};
+      and $command->{'parent'}->{'type'} eq 'unit') {
+    $tree_unit = $command->{'parent'};
   }
-  if ($element) {
+  if ($tree_unit) {
     $result .= &{$self->{'format_element_header'}}($self, $cmdname, 
-                                            $command, $element);
+                                            $command, $tree_unit);
   }
 
   my $heading_level;
   # node is used as heading if there is nothing else.
   if ($cmdname eq 'node') {
-    if (!$element or (!$element->{'extra'}->{'section'}
-                      and $element->{'extra'}->{'node'}
-                      and $element->{'extra'}->{'node'} eq $command
-                      # bogus node may not have been normalized
-                      and defined($command->{'extra'}->{'normalized'}))) {
+    if (!$tree_unit or (!$tree_unit->{'extra'}->{'section'}
+                        and $tree_unit->{'extra'}->{'node'}
+                        and $tree_unit->{'extra'}->{'node'} eq $command
+                        # bogus node may not have been normalized
+                        and defined($command->{'extra'}->{'normalized'}))) {
       if ($command->{'extra'}->{'normalized'} eq 'Top') {
         $heading_level = 0;
       } else {
@@ -3448,7 +3451,7 @@ sub _convert_xref_commands($$$$)
      = 
$self->label_command($root->{'extra'}->{'node_argument'}->{'normalized'}); 
     # This is the node if USE_NODES, otherwise this may be the sectioning 
     # command (if the sectioning command is really associated to the node)
-    my $command = $self->command_element_command($node);
+    my $command = $self->command_tree_unit_command($node);
     $command = $node if (!$node->{'extra'}->{'associated_section'}
                          or $node->{'extra'}->{'associated_section'} ne 
$command);
 
@@ -3801,7 +3804,7 @@ sub _convert_printindex_command($$$$)
       }
       if (!$associated_command) {
         $associated_command 
-          = $self->command_element_command($index_entry_ref->{'command'});
+          = $self->command_tree_unit_command($index_entry_ref->{'command'});
         if (!$associated_command) {
           # Use Top if not associated command found
           $associated_command 
@@ -3845,11 +3848,11 @@ sub _contents_inline_element($$$)
 
   my $content = &{$self->{'format_contents'}}($self, $cmdname, $command);
   if ($content) {
-    my $element_name = $contents_command_element_name{$cmdname};
+    my $special_element_name = $contents_command_element_name{$cmdname};
     my $special_element 
-      = $self->special_element($element_name);
+      = $self->special_element($special_element_name);
     my $heading;
-    my $result = "<div class=\"${element_name}_element\"";
+    my $result = "<div class=\"${special_element_name}_element\"";
     if ($special_element) {
       my $id = $self->command_id($special_element);
       if ($id ne '') {
@@ -3860,10 +3863,10 @@ sub _contents_inline_element($$$)
       # happens when called as convert() and not output()
       #cluck "$cmdname special element not defined";
       $heading 
-        = $self->convert_tree 
($self->get_conf('SPECIAL_ELEMENTS_NAME')->{$element_name});
+        = 
$self->convert_tree($self->get_conf('SPECIAL_ELEMENTS_NAME')->{$special_element_name});
     }
     $result .= ">\n";
-    my $class = $self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$element_name};
+    my $class = 
$self->get_conf('SPECIAL_ELEMENTS_CLASS')->{$special_element_name};
     $result .= &{$self->{'format_heading_text'}}($self, $class.'-heading', 
                        $heading, $self->get_conf('CHAPTER_HEADER_LEVEL'))."\n";
     $result .= $content . "</div>\n";
@@ -4183,7 +4186,7 @@ sub _convert_menu_entry_type($$$)
     # the node is the element command
     if ($node->{'extra'}->{'associated_section'} 
       and !$self->get_conf('NODE_NAME_IN_MENU')
-      and !($self->command_element_command($node) eq $node)) {
+      and !($self->command_tree_unit_command($node) eq $node)) {
       $section = $node->{'extra'}->{'associated_section'};
       $href = $self->command_href($section, undef, $command);
     } else {
@@ -4681,7 +4684,7 @@ sub _convert_root_text_type($$$$)
   # if there is no element, the parent should not be an element
   if (!$command->{'parent'} 
       or !$command->{'parent'}->{'type'}
-      or $command->{'parent'}->{'type'} ne 'element') {
+      or $command->{'parent'}->{'type'} ne 'unit') {
     $result .= &{$self->{'format_footnotes_text'}}($self);
     $result .= $self->get_conf('DEFAULT_RULE') ."\n",
       if ($self->get_conf('PROGRAM_NAME_IN_FOOTER') 
@@ -4761,9 +4764,9 @@ sub _print_title($)
 
 # Function for converting the top-level elements in the conversion: a section 
 # or a node.  $ELEMENT was created in this module (in _prepare_elements), with 
-# type 'element' (it's not a tree element created by the parser).  $CONTENT
+# type 'unit' (it's not a tree unit created by the parser).  $CONTENT
 # is the contents of the node/section, already converted.
-sub _convert_element_type($$$$)
+sub _convert_tree_unit_type($$$$)
 {
   my $self = shift;
   my $type = shift;
@@ -4815,15 +4818,19 @@ sub _convert_element_type($$$$)
       return '';
     }
     $result .= $special_element_body . '</div>';
-  } elsif (!$element->{'element_prev'}) {
-    $result .= $self->_print_title();
-    if (!$element->{'element_next'}) {
-      # only one element
-      $result .= $content;
-      $result .= &{$self->{'format_footnotes_text'}}($self);
-      $result .= $self->get_conf('DEFAULT_RULE');
-      $result .= join('', $self->close_registered_sections_level(0));
-      return $result;
+  } else {
+    my $tree_unit = $element;
+    if (!$tree_unit->{'unit_prev'}) {
+
+      $result .= $self->_print_title();
+      if (!$tree_unit->{'unit_next'}) {
+        # only one element
+        $result .= $content;
+        $result .= &{$self->{'format_footnotes_text'}}($self);
+        $result .= $self->get_conf('DEFAULT_RULE');
+        $result .= join('', $self->close_registered_sections_level(0));
+        return $result;
+      }
     }
   }
   $result .= $content unless ($special_element);
@@ -4832,6 +4839,9 @@ sub _convert_element_type($$$$)
   return $result;
 }
 
+$default_types_conversion{'unit'} = \&_convert_tree_unit_type;
+
+# for tree unit elements and special elements
 sub _default_format_element_footer($$$$)
 {
   my $self = shift;
@@ -4840,15 +4850,15 @@ sub _default_format_element_footer($$$$)
   my $content = shift;
 
   my $result = '';
-  my $is_top = $self->element_is_top($element);
-  my $next_is_top = ($element->{'element_next'} 
-                     and $self->element_is_top($element->{'element_next'}));
-  my $next_is_special = (defined($element->{'element_next'})
-    and $element->{'element_next'}->{'extra'}->{'special_element'});
+  my $is_top = $self->element_is_tree_unit_top($element);
+  my $next_is_top = ($element->{'unit_next'}
+                     and 
$self->element_is_tree_unit_top($element->{'unit_next'}));
+  my $next_is_special = (defined($element->{'unit_next'})
+    and $element->{'unit_next'}->{'extra'}->{'special_element'});
 
-  my $end_page = (!$element->{'element_next'}
+  my $end_page = (!$element->{'unit_next'}
        or (defined($element->{'filename'}) 
-           and $element->{'filename'} ne 
$element->{'element_next'}->{'filename'}
+           and $element->{'filename'} ne $element->{'unit_next'}->{'filename'}
            and $self->{'file_counters'}->{$element->{'filename'}} == 1));
 
   my $is_special = $element->{'extra'}->{'special_element'};
@@ -4898,9 +4908,9 @@ sub _default_format_element_footer($$$$)
   }
   # FIXME the following condition is almost a duplication of end_page 
   # except that the file counter needs not be 1
-  if ((!$element->{'element_next'}
+  if ((!$element->{'unit_next'}
        or (defined($element->{'filename'})
-           and $element->{'filename'} ne 
$element->{'element_next'}->{'filename'}))
+           and $element->{'filename'} ne 
$element->{'unit_next'}->{'filename'}))
       and $self->get_conf('footnotestyle') eq 'end') {
     $result .= &{$self->{'format_footnotes_text'}}($self);
   }
@@ -4922,14 +4932,12 @@ sub _default_format_element_footer($$$$)
   }
   if ($buttons) {
     $result .= &{$self->{'format_navigation_header_panel'}}($self, $buttons,
-                                                     undef, $element);
+                                                          undef, $element);
   }
   
   return $result;
 }
 
-$default_types_conversion{'element'} = \&_convert_element_type;
-
 sub _new_document_context($$)
 {
   my $self = shift;
@@ -5599,7 +5607,7 @@ sub _new_sectioning_command_target($$)
 sub _set_root_commands_targets_node_files($$)
 {
   my $self = shift;
-  my $elements = shift;
+  my $tree_units = shift;
 
   my $no_unidecode;
   $no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE')) 
@@ -5626,9 +5634,9 @@ sub _set_root_commands_targets_node_files($$)
     }
   }
 
-  if ($elements) {
-    foreach my $element (@$elements) {
-      foreach my $root_command(@{$element->{'contents'}}) {
+  if ($tree_units) {
+    foreach my $tree_unit (@$tree_units) {
+      foreach my $root_command(@{$tree_unit->{'contents'}}) {
         # this happens for type 'text_root' which precedes the 
         # root commands.  The target may also already be set for top node.
         next if (!defined($root_command->{'cmdname'}) 
@@ -5641,12 +5649,12 @@ sub _set_root_commands_targets_node_files($$)
   }
 }
 
-sub _get_element($$;$);
+sub _html_get_tree_unit($$;$);
 
 # If $find_container is set, the element that holds the command is found,
 # otherwise the element that holds the command content is found.  This is 
 # mostly relevant for footnote only.
-sub _get_element($$;$)
+sub _html_get_tree_unit($$;$)
 {
   my $self = shift;
   my $command = shift;
@@ -5654,57 +5662,57 @@ sub _get_element($$;$)
 
   my $current = $command;
 
-  my ($element, $root_command);
+  my ($tree_unit, $root_command);
   while (1) {
     if ($current->{'type'}) {
-      if ($current->{'type'} eq 'element') {
+      if ($current->{'type'} eq 'unit') {
         return ($current, $root_command);
       }
     }
     if ($current->{'cmdname'}) {
       if ($root_commands{$current->{'cmdname'}}) {
         $root_command = $current;
-        return ($element, $root_command) if defined($element);
+        return ($tree_unit, $root_command) if defined($tree_unit);
       } elsif ($region_commands{$current->{'cmdname'}}) {
         if ($current->{'cmdname'} eq 'copying' 
             and $self->{'global_commands'}
             and $self->{'global_commands'}->{'insertcopying'}) {
           foreach my 
$insertcopying(@{$self->{'global_commands'}->{'insertcopying'}}) {
-            my ($element, $root_command) 
-              = $self->_get_element($insertcopying, $find_container);
-            return ($element, $root_command)
-              if (defined($element) or defined($root_command));
+            my ($tree_unit, $root_command)
+              = $self->_html_get_tree_unit($insertcopying, $find_container);
+            return ($tree_unit, $root_command)
+              if (defined($tree_unit) or defined($root_command));
           }
         } elsif ($current->{'cmdname'} eq 'titlepage'
                  and $self->get_conf('USE_TITLEPAGE_FOR_TITLE')
                  and $self->get_conf('SHOW_TITLE')
-                 and $self->{'elements'}->[0]) {
-          return ($self->{'elements'}->[0], 
-                  $self->{'elements'}->[0]->{'extra'}->{'element_command'});
+                 and $self->{'tree_units'}->[0]) {
+          return ($self->{'tree_units'}->[0],
+                  $self->{'tree_units'}->[0]->{'extra'}->{'unit_command'});
         }
-        die "Problem $element, $root_command" if (defined($element) 
+        die "Problem $tree_unit, $root_command" if (defined($tree_unit)
                                                   or defined($root_command));
         return (undef, undef);
       } elsif ($current->{'cmdname'} eq 'footnote' 
            and $self->{'special_elements_types'}->{'Footnotes'}
            and $find_container) {
            # in that case there is no root_command
-          $element = $self->{'special_elements_types'}->{'Footnotes'};
-          return ($element);
+          $tree_unit = $self->{'special_elements_types'}->{'Footnotes'};
+          return ($tree_unit);
       }
     }
     if ($current->{'parent'}) {
       $current = $current->{'parent'};
     } else {
-      return ($element, $root_command);
+      return ($tree_unit, $root_command);
     }
   }
 }
 
-sub _set_html_pages_files($$$$$$$$)
+sub _html_set_pages_files($$$$$$$$)
 {
   my $self = shift;
-  my $elements = shift;
+  my $tree_units = shift;
   my $special_elements = shift;
   my $output_file = shift;
   my $destination_directory = shift;
@@ -5712,7 +5720,7 @@ sub _set_html_pages_files($$$$$$$$)
   my $document_name = shift;
 
   # Ensure that the document has pages
-  return undef if (!defined($elements) or !@$elements);
+  return undef if (!defined($tree_units) or !@$tree_units);
 
   my $extension = '';
   $extension = '.'.$self->get_conf('EXTENSION') 
@@ -5720,10 +5728,10 @@ sub _set_html_pages_files($$$$$$$$)
                 and $self->get_conf('EXTENSION') ne '');
 
   if (!$self->get_conf('SPLIT')) {
-    foreach my $element (@$elements) {
-      if (!defined($element->{'filename'})) {
-        $element->{'filename'} = $output_filename;
-        $element->{'out_filename'} = $output_file;
+    foreach my $tree_unit (@$tree_units) {
+      if (!defined($tree_unit->{'filename'})) {
+        $tree_unit->{'filename'} = $output_filename;
+        $tree_unit->{'out_filename'} = $output_file;
       }
     }
   } else {
@@ -5733,22 +5741,22 @@ sub _set_html_pages_files($$$$$$$$)
     my $top_node_filename = $self->top_node_filename($document_name);
     # first determine the top node file name.
     if ($node_top and defined($top_node_filename)) {
-      my ($node_top_element) = $self->_get_element($node_top);
+      my ($node_top_tree_unit) = $self->_html_get_tree_unit($node_top);
       die "BUG: No element for top node" if (!defined($node_top));
-      $self->_set_element_file($node_top_element, $top_node_filename,
+      $self->set_tree_unit_file($node_top_tree_unit, $top_node_filename,
                                $destination_directory);
     }
     my $file_nr = 0;
     my $previous_page;
-    foreach my $element(@$elements) {
+    foreach my $tree_unit (@$tree_units) {
       # For Top node.
-      next if (defined($element->{'filename'}));
-      if (!$element->{'extra'}->{'first_in_page'}) {
-        cluck ("No first_in_page for $element\n");
+      next if (defined($tree_unit->{'filename'}));
+      if (!$tree_unit->{'extra'}->{'first_in_page'}) {
+        cluck ("No first_in_page for $tree_unit\n");
       }
-      if (!defined($element->{'extra'}->{'first_in_page'}->{'filename'})) {
-        my $file_element = $element->{'extra'}->{'first_in_page'};
-        foreach my $root_command (@{$file_element->{'contents'}}) {
+      if (!defined($tree_unit->{'extra'}->{'first_in_page'}->{'filename'})) {
+        my $file_tree_unit = $tree_unit->{'extra'}->{'first_in_page'};
+        foreach my $root_command (@{$file_tree_unit->{'contents'}}) {
           if ($root_command->{'cmdname'} 
               and $root_command->{'cmdname'} eq 'node') {
             my $node_filename;
@@ -5769,74 +5777,74 @@ sub _set_html_pages_files($$$$$$$$)
               $node_filename 
                 = $self->{'targets'}->{$root_command}->{'node_filename'};
             }
-            $self->_set_element_file($file_element, $node_filename,
-                                     $destination_directory);
+            $self->set_tree_unit_file($file_tree_unit, $node_filename,
+                                      $destination_directory);
             last;
           }
         }
-        if (!defined($file_element->{'filename'})) {
+        if (!defined($file_tree_unit->{'filename'})) {
           # use section to do the file name if there is no node
-          my $command = $self->element_command($file_element);
+          my $command = $self->element_command($file_tree_unit);
           if ($command) {
             if ($command->{'cmdname'} eq 'top' and !$node_top
                 and defined($top_node_filename)) {
-              $self->_set_element_file($file_element, $top_node_filename,
-                                       $destination_directory);
+              $self->set_tree_unit_file($file_tree_unit, $top_node_filename,
+                                        $destination_directory);
             } else {
-              $self->_set_element_file($file_element,
+              $self->set_tree_unit_file($file_tree_unit,
                  $self->{'targets'}->{$command}->{'section_filename'},
-                                       $destination_directory);
+                                        $destination_directory);
             }
           } else {
             # when everything else has failed
             if ($file_nr == 0 and !$node_top 
                 and defined($top_node_filename)) {
-              $self->_set_element_file($file_element, $top_node_filename,
-                                       $destination_directory);
+              $self->set_tree_unit_file($file_tree_unit, $top_node_filename,
+                                        $destination_directory);
             } else {
               my $filename = $document_name . "_$file_nr";
               $filename .= $extension;
-              $self->_set_element_file($element, $filename,
-                                       $destination_directory);
+              $self->set_tree_unit_file($tree_unit, $filename,
+                                        $destination_directory);
             }
             $file_nr++;
           }
         }
       }
-      $element->{'filename'} 
-         = $element->{'extra'}->{'first_in_page'}->{'filename'};
-      $element->{'out_filename'}
-         = $element->{'extra'}->{'first_in_page'}->{'out_filename'};
+      $tree_unit->{'filename'}
+         = $tree_unit->{'extra'}->{'first_in_page'}->{'filename'};
+      $tree_unit->{'out_filename'}
+         = $tree_unit->{'extra'}->{'first_in_page'}->{'out_filename'};
     }
   }
 
-  foreach my $element (@$elements) {
+  foreach my $tree_unit (@$tree_units) {
     if (defined($Texinfo::Config::element_file_name)) {
       # NOTE the information that it is associated with @top or @node Top
-      # may be determined with $self->element_is_top($element);
-      my $filename = &$Texinfo::Config::element_file_name($self, $element, 
-                                                          
$element->{'filename'});
-      $self->_set_element_file($element, $filename, $destination_directory)
+      # may be determined with $self->element_is_tree_unit_top($tree_unit);
+      my $filename = &$Texinfo::Config::element_file_name($self, $tree_unit,
+                                                          
$tree_unit->{'filename'});
+      $self->set_tree_unit_file($tree_unit, $filename, $destination_directory)
          if (defined($filename));
     }
-    $self->{'file_counters'}->{$element->{'filename'}}++;
-    print STDERR "Page $element 
".Texinfo::Structuring::_print_element_command_texi($element).": 
$element->{'filename'}($self->{'file_counters'}->{$element->{'filename'}})\n"
+    $self->{'file_counters'}->{$tree_unit->{'filename'}}++;
+    print STDERR "Page $tree_unit 
".Texinfo::Structuring::_print_element_command_texi($tree_unit).": 
$tree_unit->{'filename'}($self->{'file_counters'}->{$tree_unit->{'filename'}})\n"
       if ($self->get_conf('DEBUG'));
   }
   if ($special_elements) {
-    my $previous_element = $elements->[-1];
-    foreach my $element (@$special_elements) {
+    my $previous_tree_unit = $tree_units->[-1];
+    foreach my $special_element (@$special_elements) {
       my $filename 
-       = $self->{'targets'}->{$element}->{'misc_filename'};
+       = $self->{'targets'}->{$special_element}->{'misc_filename'};
       if (defined($filename)) {
-        $self->_set_element_file($element, $filename, $destination_directory);
-        $self->{'file_counters'}->{$element->{'filename'}}++;
-        print STDERR "Special page $element: 
$element->{'filename'}($self->{'file_counters'}->{$element->{'filename'}})\n"
+        $self->set_tree_unit_file($special_element, $filename, 
$destination_directory);
+        $self->{'file_counters'}->{$special_element->{'filename'}}++;
+        print STDERR "Special page $special_element: 
$special_element->{'filename'}($self->{'file_counters'}->{$special_element->{'filename'}})\n"
           if ($self->get_conf('DEBUG'));
       }
-      $element->{'element_prev'} = $previous_element;
-      $previous_element->{'element_next'} = $element;
-      $previous_element = $element;
+      $special_element->{'unit_prev'} = $previous_tree_unit;
+      $previous_tree_unit->{'unit_next'} = $special_element;
+      $previous_tree_unit = $special_element;
     }
   }
 }
@@ -5854,19 +5862,19 @@ sub _prepare_elements($$$$)
   my $destination_directory = shift;
   my $document_name = shift;
 
-  my $elements;
+  my $tree_units;
 
   if ($self->get_conf('USE_NODES')) {
-    $elements = Texinfo::Structuring::split_by_node($root);
+    $tree_units = Texinfo::Structuring::split_by_node($root);
   } else {
-    $elements = Texinfo::Structuring::split_by_section($root);
+    $tree_units = Texinfo::Structuring::split_by_section($root);
   }
 
-  $self->{'elements'} = $elements
-    if (defined($elements));
+  $self->{'tree_units'} = $tree_units
+    if (defined($tree_units));
 
-  # This may be done as soon as elements are available.
-  $self->_prepare_global_targets($elements);
+  # This may be done as soon as tree units are available.
+  $self->_prepare_tree_units_global_targets($tree_units);
 
   # the presence of contents elements in the document is used in diverse
   # places, set it once for all here
@@ -5879,31 +5887,31 @@ sub _prepare_elements($$$$)
   # Do that before the other elements, to be sure that special page ids
   # are registered before elements id are.
   my $special_elements 
-    = $self->_prepare_special_elements($elements, $destination_directory,
+    = $self->_prepare_special_elements($tree_units, $destination_directory,
                                        $document_name);
   $self->set_global_document_commands(0, \@conf_for_special_elements);
 
   $self->{'special_elements'} = $special_elements 
     if (defined($special_elements));
 
-  #if ($elements) {
-  #  foreach my $element(@{$elements}) {
+  #if ($tree_units) {
+  #  foreach my $element(@{$tree_units}) {
   #    print STDERR "ELEMENT $element->{'type'}: $element\n";
   #  }
   #}
 
-  $self->_set_root_commands_targets_node_files($elements);
+  $self->_set_root_commands_targets_node_files($tree_units);
 
   # setup untranslated strings
   $self->_translate_names();
 
-  return ($elements, $special_elements);
+  return ($tree_units, $special_elements);
 }
 
 sub _prepare_special_elements($$$$)
 {
   my $self = shift;
-  my $elements = shift;
+  my $tree_units = shift;
   my $destination_directory = shift;
   my $document_name = shift;
 
@@ -5923,12 +5931,12 @@ sub _prepare_special_elements($$$$)
   }
   if ($self->{'global_commands'}->{'footnote'}
       and $self->get_conf('footnotestyle') eq 'separate'
-      and $elements and scalar(@$elements) > 1) {
+      and $tree_units and scalar(@$tree_units) > 1) {
     $do_special{'Footnotes'} = 1;
   }
 
   if ((!defined($self->get_conf('DO_ABOUT')) 
-       and $elements and scalar(@$elements) > 1 
+       and $tree_units and scalar(@$tree_units) > 1
            and ($self->get_conf('SPLIT') or $self->get_conf('HEADERS')))
        or ($self->get_conf('DO_ABOUT'))) {
     $do_special{'About'} = 1;
@@ -5942,7 +5950,7 @@ sub _prepare_special_elements($$$$)
   foreach my $type (@{$self->{'misc_elements_order'}}) {
     next unless ($do_special{$type});
 
-    my $element = {'type' => 'element',
+    my $element = {'type' => 'unit',
                    'extra' => {'special_element' => $type,
                                }};
     $element->{'extra'}->{'directions'}->{'This'} = $element;
@@ -5979,7 +5987,7 @@ sub _prepare_special_elements($$$$)
     if ($self->get_conf('SPLIT') or !$self->get_conf('MONOLITHIC')
         or (defined($filename) ne defined($default_filename))
         or (defined($filename) and $filename ne $default_filename)) {
-      $self->_set_element_file($element, $filename, $destination_directory);
+      $self->set_tree_unit_file($element, $filename, $destination_directory);
       print STDERR "NEW page for $type ($filename)\n" if 
($self->get_conf('DEBUG'));
     }
     $self->{'targets'}->{$element} = {'target' => $target,
@@ -5994,7 +6002,7 @@ sub _prepare_special_elements($$$$)
         $self->{'frame_pages_file_string'}->{$type};
       $default_filename .= '.'.$extension if (defined($extension));
 
-      my $element = {'type' => 'element',
+      my $element = {'type' => 'unit',
                    'extra' => {'special_element' => $type,
                                }};
 
@@ -6026,8 +6034,8 @@ sub _prepare_contents_elements($)
       if ($self->get_conf($cmdname)) {
         my $default_filename;
         if ($self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'after_title') {
-          if ($self->{'elements'}) {
-            $default_filename = $self->{'elements'}->[0]->{'filename'};
+          if ($self->{'tree_units'}) {
+            $default_filename = $self->{'tree_units'}->[0]->{'filename'};
           }
         } elsif ($self->get_conf('CONTENTS_OUTPUT_LOCATION') eq 'after_top') {
           my $section_top = undef;
@@ -6040,7 +6048,7 @@ sub _prepare_contents_elements($)
               and $self->{'global_commands'}->{$cmdname}) {
             foreach my $command(@{$self->{'global_commands'}->{$cmdname}}) {
               my ($element, $root_command) 
-                = $self->_get_element($command);
+                = $self->_html_get_tree_unit($command);
               if (defined($element)) {
                 $default_filename = $element->{'filename'};
                 last;
@@ -6054,58 +6062,58 @@ sub _prepare_contents_elements($)
           next;
         }
 
-        my $element = {'type' => 'element',
-                       'extra' => {'special_element' => $type}};
-        $self->{'special_elements_types'}->{$type} = $element;
+        my $contents_element = {'type' => 'unit',
+                                'extra' => {'special_element' => $type}};
+        $self->{'special_elements_types'}->{$type} = $contents_element;
         my $target = $self->{'misc_elements_targets'}->{$type};
         my $filename;
         if (defined($Texinfo::Config::special_element_target_file_name)) {
           ($target, $filename)
                = &$Texinfo::Config::special_element_target_file_name(
                                                           $self,
-                                                          $element,
+                                                          $contents_element,
                                                           $target,
                                                           $default_filename);
         }
         $filename = $default_filename if (!defined($filename));
-        print STDERR "Add content $element $type: target $target,\n".
+        print STDERR "Add content $contents_element $type: target $target,\n".
            "    filename $filename\n" if ($self->get_conf('DEBUG'));
-        $self->{'targets'}->{$element} = {'target' => $target,
-                                          'misc_filename' => $filename,
-                                          'filename' => $filename,
-                                          };
+        $self->{'targets'}->{$contents_element} = {'target' => $target,
+                                                   'misc_filename' => 
$filename,
+                                                   'filename' => $filename,
+                                                  };
       }
     }
   }
 }
 
-# Associate elements with the global targets, First, Last, Top, Index.
-sub _prepare_global_targets($$)
+# Associate tree units with the global targets, First, Last, Top, Index.
+sub _prepare_tree_units_global_targets($$)
 {
   my $self = shift;
-  my $elements = shift;
+  my $tree_units = shift;
 
-  $self->{'global_target_elements'}->{'First'} = $elements->[0];
-  $self->{'global_target_elements'}->{'Last'} = $elements->[-1];
+  $self->{'global_target_elements'}->{'First'} = $tree_units->[0];
+  $self->{'global_target_elements'}->{'Last'} = $tree_units->[-1];
   # It is always the first printindex, even if it is not output (for example
   # it is in @copying and @titlepage, which are certainly wrong constructs).
   if ($self->{'global_commands'} and 
$self->{'global_commands'}->{'printindex'}) {
-    my ($element, $root_command) 
-     = $self->_get_element($self->{'global_commands'}->{'printindex'}->[0]);
-    if (defined($element)) {
+    my ($tree_unit, $root_command)
+     = 
$self->_html_get_tree_unit($self->{'global_commands'}->{'printindex'}->[0]);
+    if (defined($tree_unit)) {
       if ($root_command and $root_command->{'cmdname'} eq 'node' 
-          and $element->{'extra'}->{'section'}) {
-        $root_command = $element->{'extra'}->{'section'};
+          and $tree_unit->{'extra'}->{'section'}) {
+        $root_command = $tree_unit->{'extra'}->{'section'};
       }
       if ($root_command and $root_command->{'cmdname'} ne 'node') {
         while ($root_command->{'level'} > 1
                and $root_command->{'section_up'}
                and $root_command->{'section_up'}->{'parent'}) {
           $root_command = $root_command->{'section_up'};
-          $element = $root_command->{'parent'};
+          $tree_unit = $root_command->{'parent'};
         }
       }
-      $self->{'global_target_elements'}->{'Index'} = $element;
+      $self->{'global_target_elements'}->{'Index'} = $tree_unit;
     }
   }
 
@@ -6116,13 +6124,13 @@ sub _prepare_global_targets($$)
   if ($section_top) {
     $self->{'global_target_elements'}->{'Top'} = $section_top->{'parent'};
   } elsif ($node_top) {
-    my $element_top = $node_top->{'parent'};
-    if (!$element_top) {
+    my $tree_unit_top = $node_top->{'parent'};
+    if (!$tree_unit_top) {
       die "No parent for node_top: 
".Texinfo::Common::_print_current($node_top);
     }
-    $self->{'global_target_elements'}->{'Top'} = $element_top;
+    $self->{'global_target_elements'}->{'Top'} = $tree_unit_top;
   } else {
-    $self->{'global_target_elements'}->{'Top'} = $elements->[0];
+    $self->{'global_target_elements'}->{'Top'} = $tree_units->[0];
   }
   
   if ($self->get_conf('DEBUG')) {
@@ -6353,6 +6361,8 @@ foreach my $no_number_type ('text', 'tree', 'string') {
 # Return text used for linking from $ELEMENT in direction $DIRECTION.  The
 # text returned depends on $TYPE.
 #
+# This is used both for tree unit elements and external nodes
+#
 # $element can be undef.
 # $element undef happens at least when there is no output file, or for
 # the table of content when frames are used.  That call would result
@@ -6389,7 +6399,7 @@ sub _element_direction($$$$;$)
   # defined which should mostly correspond to cases when there is no
   # output file, for example in the tests.
   } elsif ((not defined($element)
-             or ($element and $self->element_is_top($element)))
+             or ($element and $self->element_is_tree_unit_top($element)))
             and defined($self->get_conf('TOP_NODE_UP_URL'))
             and ($direction eq 'Up' or $direction eq 'NodeUp')) {
     if ($type eq 'href') {
@@ -6431,7 +6441,7 @@ sub _element_direction($$$$;$)
       if ($element_target->{'extra'}->{'special_element'}) {
         $command = $element_target;
       } else {
-        $command = $element_target->{'extra'}->{'element_command'};
+        $command = $element_target->{'extra'}->{'unit_command'};
       }
       if ($type eq 'href') {
         if (defined($command)) {
@@ -7242,18 +7252,18 @@ sub convert($$)
   # If a converter is reused, it could be possible to set before and reuse
   # here something like $self->{'document_name'}
   # but it is unclear if it is correct or not.
-  my ($elements, $special_elements) 
+  my ($tree_units, $special_elements)
     = $self->_prepare_elements($root, undef, undef);
 
   $self->_prepare_index_entries();
   $self->_prepare_footnotes();
 
-  if (!defined($elements)) {
+  if (!defined($tree_units)) {
     $result = $self->_convert($root);
   } else {
-    foreach my $element (@$elements) {
-      my $element_text = $self->_convert($element);
-      $result .= $element_text;
+    foreach my $tree_unit (@$tree_units) {
+      my $tree_unit_text = $self->_convert($tree_unit);
+      $result .= $tree_unit_text;
     }
   }
 
@@ -7265,11 +7275,11 @@ sub output_internal_links($)
 {
   my $self = shift;
   my $out_string = '';
-  if ($self->{'elements'}) {
-    foreach my $element (@{$self->{'elements'}}) {
+  if ($self->{'tree_units'}) {
+    foreach my $tree_unit (@{$self->{'tree_units'}}) {
       my $text;
       my $href;
-      my $command = $self->element_command($element);
+      my $command = $self->element_command($tree_unit);
       if (defined($command)) {
         # Use '' for filename, to force a filename in href.
         $href = $self->command_href($command, '');
@@ -7397,37 +7407,37 @@ sub output($$)
 
   # Get the list of "elements" to be processed, i.e. nodes or sections.
   # This should return undef if called on a tree without node or sections.
-  my ($elements, $special_elements)
+  my ($tree_units, $special_elements)
     = $self->_prepare_elements($root, $destination_directory, $document_name);
 
-  Texinfo::Structuring::split_pages($elements, $self->get_conf('SPLIT'));
+  Texinfo::Structuring::split_pages($tree_units, $self->get_conf('SPLIT'));
 
   # determine file names associated with the different pages, and setup
   # the counters for special element pages.
   if ($output_file ne '') {
-    $self->_set_html_pages_files($elements, $special_elements, $output_file,
+    $self->_html_set_pages_files($tree_units, $special_elements, $output_file,
                   $destination_directory, $output_filename, $document_name);
   }
 
   $self->_prepare_contents_elements();
 
-  # do element directions. 
-  Texinfo::Structuring::elements_directions($self, $self->{'labels'}, 
$elements);
+  # do tree units directions.
+  Texinfo::Structuring::elements_directions($self, $self->{'labels'}, 
$tree_units);
 
   # do element directions related to files.
   # FIXME do it here or before?  Here it means that
   # PrevFile and NextFile can be set.
-  Texinfo::Structuring::elements_file_directions($elements);
+  Texinfo::Structuring::elements_file_directions($tree_units);
 
   # Associate the special elements that have no page with the main page.
   # This may only happen if not split.
   if ($special_elements 
-      and $elements and $elements->[0] 
-      and defined($elements->[0]->{'filename'})) {
+      and $tree_units and $tree_units->[0]
+      and defined($tree_units->[0]->{'filename'})) {
     foreach my $special_element (@$special_elements) {
       if (!defined($special_element->{'filename'})) {
-        $special_element->{'filename'} = $elements->[0]->{'filename'};
-        $special_element->{'out_filename'} = $elements->[0]->{'out_filename'};
+        $special_element->{'filename'} = $tree_units->[0]->{'filename'};
+        $special_element->{'out_filename'} = 
$tree_units->[0]->{'out_filename'};
         $self->{'file_counters'}->{$special_element->{'filename'}}++;
       }
     }
@@ -7519,7 +7529,8 @@ sub output($$)
      {'contents' => $self->{'global_commands'}->{'copying'}->{'contents'}},
      {Texinfo::Convert::Text::copy_options_for_convert_text($self)});
     if ($copying_comment ne '') {
-      $self->{'copying_comment'} = &{$self->{'format_comment'}}($self, 
$copying_comment);
+      $self->{'copying_comment'}
+        = &{$self->{'format_comment'}}($self, $copying_comment);
     }
   }
   $self->set_global_document_commands(0, ['documentlanguage']);
@@ -7532,7 +7543,8 @@ sub output($$)
     $self->{'documentdescription_string'} 
       = $self->convert_tree_new_formatting_context(
        {'type' => '_string',
-        'contents' => 
$self->{'global_commands'}->{'documentdescription'}->{'contents'}},
+        'contents' =>
+            $self->{'global_commands'}->{'documentdescription'}->{'contents'}},
        'documentdescription');
     chomp($self->{'documentdescription_string'});
   }
@@ -7593,7 +7605,7 @@ sub output($$)
   my $fh;
   my $output = '';
 
-  if (!$elements or !defined($elements->[0]->{'filename'})) {
+  if (!$tree_units or !defined($tree_units->[0]->{'filename'})) {
     # no page
     my $outfile;
     if ($output_file ne '') {
@@ -7617,10 +7629,10 @@ sub output($$)
     $self->{'current_filename'} = $output_filename;
 
     my $body = '';
-    if ($elements and @$elements) {
-      foreach my $element (@$elements) {
-        my $element_text = $self->_convert($element);
-        $body .= $element_text;
+    if ($tree_units and @$tree_units) {
+      foreach my $tree_unit (@$tree_units) {
+        my $tree_unit_text = $self->_convert($tree_unit);
+        $body .= $tree_unit_text;
       }
     } else {
       $body .= $self->_print_title();
@@ -7649,9 +7661,9 @@ sub output($$)
       if ($self->get_conf('DEBUG'));
     my %files;
     
-    # Now do the output, converting each member in @$elements in turn.
+    # Now do the output, converting each tree units and special elements in 
turn
     $special_elements = [] if (!defined($special_elements));
-    foreach my $element (@$elements, @$special_elements) {
+    foreach my $element (@$tree_units, @$special_elements) {
       my $file_fh;
       $self->{'current_filename'} = $element->{'filename'};
       $self->{'counter_in_file'}->{$element->{'filename'}}++;
@@ -7690,8 +7702,7 @@ sub output($$)
           return undef;
         }
         print $file_fh "".&{$self->{'format_begin_file'}}($self, 
-                                           $element->{'filename'}, 
-                                           $element);
+                              $element->{'filename'}, $element);
         $files{$element->{'filename'}}->{'fh'} = $file_fh;
       } else {
         $file_fh = $files{$element->{'filename'}}->{'fh'};
@@ -8172,7 +8183,7 @@ sub _convert($$;$)
     } elsif ($root->{'type'} eq 'preformatted'
              or $root->{'type'} eq 'rawpreformatted') {
       
$self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'preformatted_number'}++;
-    } elsif ($root->{'type'} eq 'element') { 
+    } elsif ($root->{'type'} eq 'unit') {
       $self->{'current_element'} = $root;
       $self->{'current_filename'} = $root->{'filename'};
     } elsif ($pre_class_types{$root->{'type'}}) {
@@ -8214,7 +8225,7 @@ sub _convert($$;$)
     if ($root->{'type'} eq '_string') {
       $self->{'document_context'}->[-1]->{'string'}--;
     }
-    if ($root->{'type'} eq 'element') { 
+    if ($root->{'type'} eq 'unit') {
       delete $self->{'current_element'};
       delete $self->{'current_filename'};
     } elsif ($pre_class_types{$root->{'type'}}) {
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index a79af48..26e9816 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -189,7 +189,7 @@ sub _get_element($$)
   while (1) {
     #print STDERR Texinfo::Common::_print_current($current);
     if ($current->{'type'}) {
-      if ($current->{'type'} eq 'element') {
+      if ($current->{'type'} eq 'unit') {
         return ($current, $root_command);
       }
     }
@@ -227,11 +227,11 @@ sub _associated_node_id($$$;$)
 
     if ($root_command) {
       if (!$root_command->{'cmdname'} or $root_command->{'cmdname'} ne 'node') 
{
-        if ($element->{'extra'}->{'element_command'}
-            and $element->{'extra'}->{'element_command'} 
-            and $element->{'extra'}->{'element_command'}->{'cmdname'}
-            and $element->{'extra'}->{'element_command'}->{'cmdname'} eq 
'node') {
-          $node_command = $element->{'extra'}->{'element_command'};
+        if ($element->{'extra'}->{'unit_command'}
+            and $element->{'extra'}->{'unit_command'}
+            and $element->{'extra'}->{'unit_command'}->{'cmdname'}
+            and $element->{'extra'}->{'unit_command'}->{'cmdname'} eq 'node') {
+          $node_command = $element->{'extra'}->{'unit_command'};
         }
       } else {
         $node_command = $root_command;
@@ -435,7 +435,7 @@ sub output_ixin($$)
     foreach my $node_element (@$elements) {
       next if ($node_element->{'extra'}->{'no_node'});
       $node_nr++;
-      my $node = $node_element->{'extra'}->{'element_command'};
+      my $node = $node_element->{'extra'}->{'unit_command'};
       push @nodes, $node;
       my $normalized_node_name = $node->{'extra'}->{'normalized'};
       foreach my $setting_command_name (keys(%current_settings)) {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index fc89d5c..565f1a0 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -513,7 +513,7 @@ sub convert_tree($$)
     $self->{'empty_lines_count'} = 1;
   }
   my $result;
-  if ($root->{'type'} and $root->{'type'} eq 'element') {
+  if ($root->{'type'} and $root->{'type'} eq 'unit') {
     $result = _convert_element($self, $root);
   } else {
     $result = $self->_convert($root);
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index e9d8573..603576a 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -1003,7 +1003,7 @@ sub _convert($$;$)
         # the comand closing.  So we delay the output of @bye, and store it.
         if ($root->{'cmdname'} eq 'bye' and $root->{'parent'}
             and $root->{'parent'}->{'type'}
-            and $root->{'parent'}->{'type'} eq 'element'
+            and $root->{'parent'}->{'type'} eq 'unit'
             and !($root->{'parent'}->{'extra'}
                   and ($root->{'parent'}->{'extra'}->{'no_section'}
                        or $root->{'parent'}->{'extra'}->{'no_node'}))) {
@@ -1645,21 +1645,21 @@ sub _convert($$;$)
   # The command is closed either when the corresponding tree element
   # is done, and the command is not associated to an element, or when
   # the element is closed.
-  } elsif ((($root->{'type'} and $root->{'type'} eq 'element'
-             and $root->{'extra'} and $root->{'extra'}->{'element_command'}
-             and !($root->{'extra'}->{'element_command'}->{'cmdname'}
-                   and $root->{'extra'}->{'element_command'}->{'cmdname'} eq 
'node'))
+  } elsif ((($root->{'type'} and $root->{'type'} eq 'unit'
+             and $root->{'extra'} and $root->{'extra'}->{'unit_command'}
+             and !($root->{'extra'}->{'unit_command'}->{'cmdname'}
+                   and $root->{'extra'}->{'unit_command'}->{'cmdname'} eq 
'node'))
             or ($root->{'cmdname'} 
                 and $Texinfo::Common::root_commands{$root->{'cmdname'}}
                 and $root->{'cmdname'} ne 'node'
                 and !($root->{'parent'} and $root->{'parent'}->{'type'}
-                     and $root->{'parent'}->{'type'} eq 'element'
+                     and $root->{'parent'}->{'type'} eq 'unit'
                      and $root->{'parent'}->{'extra'} 
-                     and $root->{'parent'}->{'extra'}->{'element_command'}
-                     and $root->{'parent'}->{'extra'}->{'element_command'} eq 
$root)))
+                     and $root->{'parent'}->{'extra'}->{'unit_command'}
+                     and $root->{'parent'}->{'extra'}->{'unit_command'} eq 
$root)))
            and !$self->get_conf('USE_NODES')) {
-    if ($root->{'type'} and $root->{'type'} eq 'element') {
-      $root = $root->{'extra'}->{'element_command'};
+    if ($root->{'type'} and $root->{'type'} eq 'unit') {
+      $root = $root->{'extra'}->{'unit_command'};
     }
     my $command = $self->_level_corrected_section($root);
     if (!($root->{'section_childs'} and scalar(@{$root->{'section_childs'}}))
@@ -1680,20 +1680,20 @@ sub _convert($$;$)
       $result .= $self->{'pending_bye'};
       delete $self->{'pending_bye'};
     }
-  } elsif ((($root->{'type'} and $root->{'type'} eq 'element'
-             and $root->{'extra'} and $root->{'extra'}->{'element_command'}
-             and $root->{'extra'}->{'element_command'}->{'cmdname'}
-             and $root->{'extra'}->{'element_command'}->{'cmdname'} eq 'node')
+  } elsif ((($root->{'type'} and $root->{'type'} eq 'unit'
+             and $root->{'extra'} and $root->{'extra'}->{'unit_command'}
+             and $root->{'extra'}->{'unit_command'}->{'cmdname'}
+             and $root->{'extra'}->{'unit_command'}->{'cmdname'} eq 'node')
             or ($root->{'cmdname'} 
                 and $root->{'cmdname'} eq 'node'
                 and !($root->{'parent'} and $root->{'parent'}->{'type'}
-                     and $root->{'parent'}->{'type'} eq 'element'
+                     and $root->{'parent'}->{'type'} eq 'unit'
                      and $root->{'parent'}->{'extra'} 
-                     and $root->{'parent'}->{'extra'}->{'element_command'}
-                     and $root->{'parent'}->{'extra'}->{'element_command'} eq 
$root)))
+                     and $root->{'parent'}->{'extra'}->{'unit_command'}
+                     and $root->{'parent'}->{'extra'}->{'unit_command'} eq 
$root)))
            and $self->get_conf('USE_NODES')) {
-    #if ($root->{'type'} and $root->{'type'} eq 'element') {
-    #  $root = $root->{'extra'}->{'element_command'};
+    #if ($root->{'type'} and $root->{'type'} eq 'unit') {
+    #  $root = $root->{'extra'}->{'unit_command'};
     #}
     $result .= $self->close_element('node');
     
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index f24beef..5d62248 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -830,17 +830,17 @@ sub nodes_tree($$$$$)
   return $top_node;
 }
 
-# Return a list of elements to be converted into pages.  Each element starts
-# with a @node as its first child (except possibly the first one).
+# Return a list of tree units to be converted into pages.  Each tree unit
+# starts with a @node as its first child (except possibly the first one).
 sub split_by_node($)
 {
   my $root = shift;
   if (no_root_command_tree($root)) {
     return undef;
   }
-  my $elements;
-  my $current = { 'type' => 'element', 'extra' => {'no_node' => 1}};
-  push @$elements, $current;
+  my $tree_units;
+  my $current = { 'type' => 'unit', 'extra' => {'no_node' => 1}};
+  push @$tree_units, $current;
   my @pending_parts = ();
   foreach my $content (@{$root->{'contents'}}) {
     if ($content->{'cmdname'} and $content->{'cmdname'} eq 'part'
@@ -853,14 +853,14 @@ sub split_by_node($)
         delete $current->{'extra'}->{'no_node'};
         $current->{'extra'}->{'node'} = $content;
       } else {
-        $current = { 'type' => 'element', 'extra' => {'node' => $content}};
-        $current->{'element_prev'} = $elements->[-1];
-        $elements->[-1]->{'element_next'} = $current;
-        push @$elements, $current;
+        $current = { 'type' => 'unit', 'extra' => {'node' => $content}};
+        $current->{'unit_prev'} = $tree_units->[-1];
+        $tree_units->[-1]->{'unit_next'} = $current;
+        push @$tree_units, $current;
       }
-      $elements->[-1]->{'extra'}->{'element_command'} = $content;
+      $tree_units->[-1]->{'extra'}->{'unit_command'} = $content;
       if ($content->{'extra'}->{'associated_section'}) {
-        $elements->[-1]->{'extra'}->{'section'} 
+        $tree_units->[-1]->{'extra'}->{'section'}
           = $content->{'extra'}->{'associated_section'};
       }
     }
@@ -874,21 +874,21 @@ sub split_by_node($)
     push @{$current->{'contents'}}, $content;
     $content->{'parent'} = $current;
   }
-  return $elements;
+  return $tree_units;
 }
 
-# Return a list of elements to be converted into pages.  Each element starts
-# with the @node associated with a sectioning command or with the sectioning
-# command if there is no associated node
+# Return a list of tree units to be converted into pages.  Each tree unit
+# starts with the @node associated with a sectioning command or with the
+# sectioning command if there is no associated node
 sub split_by_section($)
 {
   my $root = shift;
   if (no_root_command_tree($root)) {
     return undef;
   }
-  my $elements;
-  my $current = { 'type' => 'element', 'extra' => {'no_section' => 1}};
-  push @$elements, $current;
+  my $tree_units;
+  my $current = { 'type' => 'unit', 'extra' => {'no_section' => 1}};
+  push @$tree_units, $current;
   foreach my $content (@{$root->{'contents'}}) {
     if ($content->{'cmdname'}
         and (($content->{'cmdname'} eq 'node' 
@@ -908,13 +908,13 @@ sub split_by_section($)
           $current->{'extra'}->{'section'}
             = $new_section;
         } else {
-          $current = { 'type' => 'element', 
+          $current = { 'type' => 'unit',
                        'extra' => {'section' => $new_section}};
-          $current->{'element_prev'} = $elements->[-1];
-          $elements->[-1]->{'element_next'} = $current;
-          push @$elements, $current;
+          $current->{'unit_prev'} = $tree_units->[-1];
+          $tree_units->[-1]->{'unit_next'} = $current;
+          push @$tree_units, $current;
         }
-        $elements->[-1]->{'extra'}->{'element_command'} 
+        $tree_units->[-1]->{'extra'}->{'unit_command'}
           = $new_section;
       }
     } elsif ($content->{'cmdname'} and $content->{'cmdname'} ne 'node' 
@@ -922,13 +922,13 @@ sub split_by_section($)
       if ($current->{'extra'}->{'no_section'}) {
         delete $current->{'extra'}->{'no_section'};
         $current->{'extra'}->{'section'} = $content;
-        $current->{'extra'}->{'element_command'} = $content;
+        $current->{'extra'}->{'unit_command'} = $content;
       } elsif ($current->{'extra'}->{'section'} ne $content) {
-        $current = { 'type' => 'element', 'extra' => {'section' => $content,
-                                              'element_command' => $content}};
-        $current->{'element_prev'} = $elements->[-1];
-        $elements->[-1]->{'element_next'} = $current;
-        push @$elements, $current;
+        $current = { 'type' => 'unit', 'extra' => {'section' => $content,
+                                              'unit_command' => $content}};
+        $current->{'unit_prev'} = $tree_units->[-1];
+        $tree_units->[-1]->{'unit_next'} = $current;
+        push @$tree_units, $current;
       }
     }
     if ($content->{'cmdname'} and $content->{'cmdname'} eq 'node' 
@@ -938,7 +938,7 @@ sub split_by_section($)
     push @{$current->{'contents'}}, $content;
     $content->{'parent'} = $current;
   }
-  return $elements;
+  return $tree_units;
 }
 
 # Associate top-level elements with pages according to the splitting 
@@ -946,15 +946,15 @@ sub split_by_section($)
 # that is the first in the output page.
 sub split_pages ($$)
 {
-  my $elements = shift;
+  my $tree_units = shift;
   my $split = shift;
 
-  return undef if (!$elements or !@$elements);
+  return undef if (!$tree_units or !@$tree_units);
 
   my $split_level;
   if (!$split) {
-    foreach my $element (@$elements) {
-      $element->{'extra'}->{'first_in_page'} = $elements->[0];
+    foreach my $tree_unit (@$tree_units) {
+      $tree_unit->{'extra'}->{'first_in_page'} = $tree_units->[0];
     }
     return;
   } elsif ($split eq 'chapter') {
@@ -966,20 +966,20 @@ sub split_pages ($$)
   }
 
   my $current_first_in_page;
-  foreach my $element (@$elements) {
+  foreach my $tree_unit (@$tree_units) {
     my $level;
-    if ($element->{'extra'}->{'section'}) {
-      $level = $element->{'extra'}->{'section'}->{'level'};
-    } elsif ($element->{'extra'}->{'node'} 
-             and $element->{'extra'}->{'node'}->{'associated_section'}) {
-      $level = 
$element->{'extra'}->{'node'}->{'associated_section'}->{'level'};
+    if ($tree_unit->{'extra'}->{'section'}) {
+      $level = $tree_unit->{'extra'}->{'section'}->{'level'};
+    } elsif ($tree_unit->{'extra'}->{'node'}
+             and $tree_unit->{'extra'}->{'node'}->{'associated_section'}) {
+      $level = 
$tree_unit->{'extra'}->{'node'}->{'associated_section'}->{'level'};
     }
-    #print STDERR "level($split_level) $level 
"._print_element_command_texi($element)."\n";
+    #print STDERR "level($split_level) $level 
"._print_element_command_texi($tree_unit)."\n";
     if (!defined($split_level) or (defined($level) and $split_level >= $level)
         or !$current_first_in_page) {
-      $current_first_in_page = $element;
+      $current_first_in_page = $tree_unit;
     }
-    $element->{'extra'}->{'first_in_page'} = $current_first_in_page;
+    $tree_unit->{'extra'}->{'first_in_page'} = $current_first_in_page;
   }
 }
 
@@ -1011,31 +1011,37 @@ sub _node_element($)
 
 # Do element directions (like in texi2html) and store them 
 # in 'extra'->'directions'.
+# FIXME this knows about 'special_element' so this is most likely
+# HTML specific.  Maybe a way to make it less specific would be to test
+# for something else, maybe unit_command, and possible no_node, no_section
+# although probably the caller would not call on a tree with no regular
+# tree unit elements.  This also should determine the name of the function,
+# keep elements_directions if it can be called on something else than 
tree_units.
 sub elements_directions($$$)
 {
   my $configuration_informations = shift;
   my $labels = shift;
-  my $elements = shift;
-  return if (!$elements or !@$elements);
+  my $tree_units = shift;
+  return if (!$tree_units or !@$tree_units);
 
   my $node_top = $labels->{'Top'};
-  foreach my $element (@$elements) {
+  foreach my $tree_unit (@$tree_units) {
     my $directions;
-    $directions->{'This'} = $element;
-    $directions->{'Forward'} = $element->{'element_next'}
-      if ($element->{'element_next'}
-          and (($element->{'extra'}->{'special_element'}
-                and $element->{'element_next'}->{'extra'}->{'special_element'})
-               or (!$element->{'extra'}->{'special_element'}
-                and 
!$element->{'element_next'}->{'extra'}->{'special_element'})));
-    $directions->{'Back'} = $element->{'element_prev'}
-      if ($element->{'element_prev'}
-          and (($element->{'extra'}->{'special_element'}
-                and $element->{'element_prev'}->{'extra'}->{'special_element'})
-               or (!$element->{'extra'}->{'special_element'}
-                and 
!$element->{'element_prev'}->{'extra'}->{'special_element'})));
-    if ($element->{'extra'}->{'node'}) {
-      my $node = $element->{'extra'}->{'node'};
+    $directions->{'This'} = $tree_unit;
+    $directions->{'Forward'} = $tree_unit->{'unit_next'}
+      if ($tree_unit->{'unit_next'}
+          and (($tree_unit->{'extra'}->{'special_element'}
+                and $tree_unit->{'unit_next'}->{'extra'}->{'special_element'})
+               or (!$tree_unit->{'extra'}->{'special_element'}
+                and 
!$tree_unit->{'unit_next'}->{'extra'}->{'special_element'})));
+    $directions->{'Back'} = $tree_unit->{'unit_prev'}
+      if ($tree_unit->{'unit_prev'}
+          and (($tree_unit->{'extra'}->{'special_element'}
+                and $tree_unit->{'unit_prev'}->{'extra'}->{'special_element'})
+               or (!$tree_unit->{'extra'}->{'special_element'}
+                and 
!$tree_unit->{'unit_prev'}->{'extra'}->{'special_element'})));
+    if ($tree_unit->{'extra'}->{'node'}) {
+      my $node = $tree_unit->{'extra'}->{'node'};
       foreach my $direction(['NodeUp', 'node_up'], ['NodeNext', 'node_next'],
                             ['NodePrev', 'node_prev']) {
         $directions->{$direction->[0]} = 
_node_element($node->{$direction->[1]})
@@ -1070,20 +1076,20 @@ sub elements_directions($$$)
         }
       }
       
-      $directions->{'NodeForward'}->{'extra'}->{'directions'}->{'NodeBack'} = 
$element
+      $directions->{'NodeForward'}->{'extra'}->{'directions'}->{'NodeBack'} = 
$tree_unit
         if ($directions->{'NodeForward'}
-            and $directions->{'NodeForward'}->{'type'} eq 'element'
+            and $directions->{'NodeForward'}->{'type'} eq 'unit'
             and 
!$directions->{'NodeForward'}->{'extra'}->{'directions'}->{'NodeBack'});
     }
 
-    if (!$element->{'extra'}->{'section'}) {
+    if (!$tree_unit->{'extra'}->{'section'}) {
       # If there is no associated section, find the previous element section.
       # Use the FastForward of this element.
       # Use it as FastBack if the section is top level, or use the FastBack.
       my $section_element;
-      my $current = $element;
-      while ($current->{'element_prev'}) {
-        $current = $current->{'element_prev'};
+      my $current = $tree_unit;
+      while ($current->{'unit_prev'}) {
+        $current = $current->{'unit_prev'};
         if ($current->{'extra'}->{'section'}) {
           $section_element = $current;
           last;
@@ -1102,7 +1108,7 @@ sub elements_directions($$$)
         }
       }
     } else {
-      my $section = $element->{'extra'}->{'section'};
+      my $section = $tree_unit->{'extra'}->{'section'};
       foreach my $direction(['Up', 'section_up'], ['Next', 'section_next'],
                             ['Prev', 'section_prev']) {
         # in most cases $section->{$direction->[1]}->{'parent'} is defined
@@ -1140,73 +1146,75 @@ sub elements_directions($$$)
         # the element is a top level element, we adjust the next
         # toplevel element fastback
         $directions->{'FastForward'}->{'extra'}->{'directions'}->{'FastBack'}  
-          = $element if ($directions->{'FastForward'});
+          = $tree_unit if ($directions->{'FastForward'});
       }
     }
     # Use node up for Up if there is no section up.
     # Not done in the default case.
     if ($configuration_informations->get_conf('USE_UP_NODE_FOR_ELEMENT_UP')
-        and !$directions->{'Up'} and $element->{'extra'}->{'node'}
-        and $element->{'extra'}->{'node'}->{'node_up'} 
-        and (!$node_top or ($element->{'extra'}->{'node'} ne $node_top))) {
-      #print STDERR "Using node for up 
"._print_element_command_texi($element)."\n";
-      my $up_node_element = 
_node_element($element->{'extra'}->{'node'}->{'node_up'});
+        and !$directions->{'Up'} and $tree_unit->{'extra'}->{'node'}
+        and $tree_unit->{'extra'}->{'node'}->{'node_up'}
+        and (!$node_top or ($tree_unit->{'extra'}->{'node'} ne $node_top))) {
+      #print STDERR "Using node for up 
"._print_element_command_texi($tree_unit)."\n";
+      my $up_node_element = 
_node_element($tree_unit->{'extra'}->{'node'}->{'node_up'});
       $directions->{'Up'} = $up_node_element if ($up_node_element);
     }
-    if ($element->{'extra'}->{'directions'}) {
-      %{$element->{'extra'}->{'directions'}} = 
(%{$element->{'extra'}->{'directions'}}, 
+    if ($tree_unit->{'extra'}->{'directions'}) {
+      %{$tree_unit->{'extra'}->{'directions'}} = 
(%{$tree_unit->{'extra'}->{'directions'}},
                                                 %$directions)
     } else {
-      $element->{'extra'}->{'directions'} = $directions;
+      $tree_unit->{'extra'}->{'directions'} = $directions;
     }
   }
   if ($configuration_informations->get_conf('DEBUG')) {
-    foreach my $element (@$elements) {
-      print STDERR "Directions($element): "
-         . print_element_directions($element)."\n";
+    foreach my $tree_unit (@$tree_units) {
+      print STDERR "Directions($tree_unit): "
+         . print_element_directions($tree_unit)."\n";
     }
   }
 }
 
 sub elements_file_directions($)
 {
-  my $elements = shift;
-  return if (!$elements or !@$elements);
+  my $tree_units = shift;
+  return if (!$tree_units or !@$tree_units);
 
   my $current_filename;
   my $first_element_in_file;
   # need to gather the directions before the FirstInFile* directions
   # are added to the first element in the file.
   my @first_element_in_file_directions;
-  foreach my $element (@$elements) {
+  foreach my $tree_unit (@$tree_units) {
     my $directions;
     my $filename;
-    if (defined($element->{'filename'})) {
-      $filename = $element->{'filename'};
-      my $current_element = $element;
+    if (defined($tree_unit->{'filename'})) {
+      $filename = $tree_unit->{'filename'};
+      my $current_tree_unit = $tree_unit;
       if (not defined($current_filename)
           or $filename ne $current_filename) {
-        $first_element_in_file = $element;
-        @first_element_in_file_directions = keys 
%{$element->{'extra'}->{'directions'}};
+        $first_element_in_file = $tree_unit;
+        @first_element_in_file_directions = keys 
%{$tree_unit->{'extra'}->{'directions'}};
         $current_filename = $filename;
       }
-      while ($current_element->{'element_prev'}) {
-        $current_element = $current_element->{'element_prev'};
-        if (defined($current_element->{'filename'})) {
-          if ($current_element->{'filename'} ne $filename) {
-            $element->{'extra'}->{'directions'}->{'PrevFile'} = 
$current_element;
+      while ($current_tree_unit->{'unit_prev'}) {
+        $current_tree_unit = $current_tree_unit->{'unit_prev'};
+        if (defined($current_tree_unit->{'filename'})) {
+          if ($current_tree_unit->{'filename'} ne $filename) {
+            $tree_unit->{'extra'}->{'directions'}->{'PrevFile'}
+                 = $current_tree_unit;
             last;
           }
         } else {
           last;
         }
       }
-      $current_element = $element;
-      while ($current_element->{'element_next'}) {
-        $current_element = $current_element->{'element_next'};
-        if (defined($current_element->{'filename'})) {
-          if ($current_element->{'filename'} ne $filename) {
-            $element->{'extra'}->{'directions'}->{'NextFile'} = 
$current_element;
+      $current_tree_unit = $tree_unit;
+      while ($current_tree_unit->{'unit_next'}) {
+        $current_tree_unit = $current_tree_unit->{'unit_next'};
+        if (defined($current_tree_unit->{'filename'})) {
+          if ($current_tree_unit->{'filename'} ne $filename) {
+            $tree_unit->{'extra'}->{'directions'}->{'NextFile'}
+               = $current_tree_unit;
             last;
           }
         } else {
@@ -1219,7 +1227,7 @@ sub elements_file_directions($)
     if (defined($first_element_in_file)) {
       foreach my $first_in_file_direction
                 (@first_element_in_file_directions) {
-        
$element->{'extra'}->{'directions'}->{'FirstInFile'.$first_in_file_direction}
+        
$tree_unit->{'extra'}->{'directions'}->{'FirstInFile'.$first_in_file_direction}
           = 
$first_element_in_file->{'extra'}->{'directions'}->{$first_in_file_direction};
       }
     }
@@ -1269,7 +1277,7 @@ sub _print_element_command_texi($)
     return Texinfo::Convert::Texinfo::convert_to_texinfo($command);
   }
   
-  my $command = $element->{'extra'}->{'element_command'};
+  my $command = $element->{'extra'}->{'unit_command'};
   if (!defined($command)) {
     # happens when there are only nodes and sections are used as elements
     my $result = "No associated command ";
@@ -1282,6 +1290,7 @@ sub _print_element_command_texi($)
 # Used for debugging and in test suite, but not generally useful. Not
 # documented in pod section and not exportable as it should not, in
 # general, be used.
+# In general should be called with tree unit elements, but is more generic.
 sub print_element_directions($)
 {
   my $element = shift;
@@ -1745,15 +1754,15 @@ Texinfo::Structuring - information on Texinfo::Parser 
tree
   check_nodes_are_referenced($registrar, $config, $nodes_list, $top_node, 
$labels, $refs);
   associate_internal_references($registrar, $parser, $parser_informations, 
$labels, $refs);
   number_floats($parser->floats_information());
-  my $elements;
+  my $tree_units;
   if ($split_at_nodes) {
-    $elements = split_by_node($tree);
+    $tree_units = split_by_node($tree);
   } else {
-    $elements = split_by_section($tree);
+    $tree_units = split_by_section($tree);
   }
-  split_pages($elements, $split);
-  elements_directions($parser, $parser, $elements);
-  elements_file_directions($elements);
+  split_pages($tree_units, $split);
+  elements_directions($parser, $parser, $tree_units);
+  elements_file_directions($tree_units);
 
   my $index_names = $parser->indices_information();
   my $merged_index_entries
@@ -1786,7 +1795,7 @@ from converters.
 It is also possible to group the top-level contents of the tree, which consist
 in nodes and sectioning commands into elements that group together a node and
 the next sectioning element.  With C<split_by_node> nodes are considered
-to be the main sectioning elements, while with C<split_by_section> the 
+to be the main sectioning elements, while with C<split_by_section> the
 sectioning command elements are the main elements.  The first mode is typical
 of Info format, while the second correspond to a traditional book.
 The elements may be further split in I<pages>, which are not pages as
@@ -1836,7 +1845,7 @@ Complete nodes directions with menu directions.  Check 
consistency
 of menus, sectionning and nodes direction structures.
 Register errors in C<$registrar>.
 
-=item elements_directions($parser, $configuration_informations, $elements)
+=item elements_directions($parser, $configuration_informations, $tree_units)
 
 Directions are set up for the elements in the array reference given in 
 argument.  The corresponding hash reference is in 
@@ -1901,7 +1910,7 @@ The next top level element.
 
 =back
 
-=item elements_file_directions($elements)
+=item elements_file_directions($tree_units)
 
 In the directions reference described above for C<elements_directions>, sets
 the I<PrevFile> and C<NextFile> directions to the elements in previous and
@@ -2070,17 +2079,17 @@ entries with the strings that were used to sort them.
 
 Register errors in C<$registrar>.
 
-=item $elements = split_by_node($tree)
+=item $tree_units = split_by_node($tree)
 
-Returns a reference array of elements where a node is associated to
+Returns a reference array of tree units where a node is associated to
 the following sectioning commands.  Sectioning commands without nodes
 are also with the previous node, while nodes without sectioning commands
-are alone in their elements.
+are alone in their tree units.
 
-Elements are regular tree items with type I<element>, the
+Elements are regular tree items with type I<unit>, the
 associated nodes and sectioning tree items are in the array associated
-with the I<contents> key.  They have directions, namely I<element_next>
-and I<element_prev> pointing to the previous and the next element.
+with the I<contents> key.  They have directions, namely I<unit_next>
+and I<unit_prev> pointing to the previous and the next tree unit.
 
 In the I<extra> hash they have
 
@@ -2092,7 +2101,7 @@ A special case, if there are no nodes in the document, 
the value is set.
 
 =item node
 
-=item element_command
+=item unit_command
 
 The node command associated with the element.
 
@@ -2102,27 +2111,27 @@ The sectioning command associated with the element node.
 
 =back
 
-=item $elements = split_by_section($tree) 
+=item $tree_units = split_by_section($tree)
 
-Similarly with C<split_by_node>, returns an array of elements.  This time,
+Similarly with C<split_by_node>, returns an array of tree units.  This time,
 lone nodes are associated with the previous sections and lone sections
-makes up an element.
+makes up a tree unit.
 
-The extra hash keys set are the same, except that I<element_command> is 
+The extra hash keys set are the same, except that I<unit_command> is
 the sectioning command associated with the element, and I<no_node> is 
 replaced by I<no_section>.
 
-=item $pages = split_pages($elements, $split)
+=item $pages = split_pages($tree_units, $split)
 
-The elements from the array reference argument have an extra I<first_in_page>
-value set to the first element on the unit, and based on the
-value of I<$split>.  The possible values for I<$split> are
+The tree units from the array reference argument have an extra
+I<first_in_page> value set to the first tree unit in the group, and
+based on the value of I<$split>.  The possible values for I<$split> are
 
 =over
 
 =item chapter
 
-The elements are split at chapter or other toplevel sectioning elements.
+The tree units are split at chapter or other toplevel sectioning tree units.
 
 =item node
 
@@ -2130,11 +2139,11 @@ Each element has its own page.
 
 =item section
 
-The elements are split at sectioning commands below chapter.
+The tree units are split at sectioning commands below chapter.
 
 =item value evaluating to false
 
-No splitting, only one page is returned, holding all the elements.
+No splitting, only one page is returned, holding all the tree units.
 
 =back
 
diff --git a/tp/init/book.pm b/tp/init/book.pm
index 1c16b2d..168ba24 100644
--- a/tp/init/book.pm
+++ b/tp/init/book.pm
@@ -38,7 +38,7 @@ texinfo_set_from_init_file('USE_NODES', undef);
 
 texinfo_set_from_init_file('BIG_RULE', '<hr>');
 
-my ($book_previous_default_filename, $book_previous_file_name, 
+my ($book_previous_default_filename, $book_previous_file_name,
     $book_unumbered_nr);
 
 sub book_init($)
@@ -63,24 +63,24 @@ sub book_print_up_toc($$)
   my $result = '';
   my $current_command = $command;
   my @up_commands;
-  while (defined($current_command->{'section_up'}) 
+  while (defined($current_command->{'section_up'})
            and ($current_command->{'section_up'} ne $current_command)
            and defined($current_command->{'section_up'}->{'cmdname'})) {
     unshift (@up_commands, $current_command->{'section_up'});
     $current_command = $current_command->{'section_up'};
   }
-  # this happens for example for top element
+  # this happens for example for top tree unit
   return '' if !(@up_commands);
   #print $fh "<ul>" . &$anchor('', $Texi2HTML::HREF{Contents}, '[' . 
$Texi2HTML::NAME{Contents} . ']') . " <br>\n";
   my $up = shift @up_commands;
 #print STDERR "$up $up->{'cmdname'} 
".Texinfo::Structuring::_print_root_command_texi($up)."\n";
-  $result .= $converter->_attribute_class('ul', $NO_BULLET_LIST_CLASS)."><li>" 
-  . "<a 
href=\"".$converter->command_href($up)."\">".$converter->command_text($up) 
+  $result .= $converter->_attribute_class('ul', $NO_BULLET_LIST_CLASS)."><li>"
+  . "<a 
href=\"".$converter->command_href($up)."\">".$converter->command_text($up)
    . "</a> </li>\n";
   foreach my $up (@up_commands) {
     $result .= '<li>'
     .$converter->_attribute_class('ul', $NO_BULLET_LIST_CLASS)."><li>"
-    . "<a 
href=\"".$converter->command_href($up)."\">".$converter->command_text($up) 
+    . "<a 
href=\"".$converter->command_href($up)."\">".$converter->command_text($up)
    . "</a> </li>\n";
   }
   foreach my $up (@up_commands) {
@@ -95,28 +95,27 @@ sub book_format_navigation_header($$$$)
   my $self = shift;
   my $buttons = shift;
   my $cmdname = shift;
-  my $command = shift;
+  my $element = shift;
 
-  my $element = $command->{'parent'};
-  if ($element 
-      and $element->{'extra'}->{'section'}
-      and ($element->{'contents'}->[0] eq $command
-          or (!$element->{'contents'}->[0]->{'cmdname'} 
-              and $element->{'contents'}->[1] eq $command))
-      and defined($element->{'filename'})
-      and $self->{'counter_in_file'}->{$element->{'filename'}} == 1) {
+  my $tree_unit = $element->{'parent'};
+  if ($tree_unit and $tree_unit->{'extra'}->{'section'}
+      and ($tree_unit->{'contents'}->[0] eq $element
+          or (!$tree_unit->{'contents'}->[0]->{'cmdname'}
+              and $tree_unit->{'contents'}->[1] eq $element))
+      and defined($tree_unit->{'filename'})
+      and $self->{'counter_in_file'}->{$tree_unit->{'filename'}} == 1) {
     
-    return book_print_up_toc($self, $element->{'extra'}->{'section'}) .
+    return book_print_up_toc($self, $tree_unit->{'extra'}->{'section'}) .
        &{$self->default_formatting_function('format_navigation_header')}($self,
-                                 $buttons, $cmdname, $command);
+                                 $buttons, $cmdname, $element);
 
   } else {
-    return 
&{$self->default_formatting_function('format_navigation_header')}($self, 
-             $buttons, $cmdname, $command);
+    return &{$self->default_formatting_function('format_navigation_header')}(
+                                          $self, $buttons, $cmdname, $element);
   }
 }
 
-texinfo_register_formatting_function('format_navigation_header', 
+texinfo_register_formatting_function('format_navigation_header',
                                      \&book_format_navigation_header);
 
 sub book_print_sub_toc($$$);
@@ -133,17 +132,14 @@ sub book_print_sub_toc($$$)
   if ($content_href) {
     $result .= "<li> "."<a href=\"$content_href\">$heading</a>" . " </li>\n";
   }
-#print STDERR "SUB_TOC $element->{'text'}\n"; #sleep 1;
   if ($command->{'section_childs'} and @{$command->{'section_childs'}}) {
-#print STDERR "SUB_TOC child $element->{'child'}->{'text'}\n";
     $result .= '<li>'.$converter->_attribute_class('ul',$NO_BULLET_LIST_CLASS)
-     .">\n". book_print_sub_toc($converter, $parent_command, 
-                                $command->{'section_childs'}->[0]) 
+     .">\n". book_print_sub_toc($converter, $parent_command,
+                                $command->{'section_childs'}->[0])
      ."</ul></li>\n";
   }
   if (exists($command->{'section_next'})) {
-#print STDERR "SUB_TOC next($element->{'text'}) 
$element->{'next'}->{'text'}\n";
-    $result .= book_print_sub_toc($converter, $parent_command, 
+    $result .= book_print_sub_toc($converter, $parent_command,
                                   $command->{'section_next'});
   }
   return $result;
@@ -190,27 +186,27 @@ sub book_convert_heading_command($$$$$)
   print STDERR "Process $command "
         .Texinfo::Structuring::_print_root_command_texi($command)."\n"
           if ($self->get_conf('DEBUG'));
-  my $element;
-  if ($Texinfo::Common::root_commands{$command->{'cmdname'}} 
+  my $tree_unit;
+  if ($Texinfo::Common::root_commands{$command->{'cmdname'}}
       and $command->{'parent'}
       and $command->{'parent'}->{'type'}
-      and $command->{'parent'}->{'type'} eq 'element') {
-    $element = $command->{'parent'};
+      and $command->{'parent'}->{'type'} eq 'unit') {
+    $tree_unit = $command->{'parent'};
   }
-  if ($element) {
+  if ($tree_unit) {
     $result .= &{$self->{'format_element_header'}}($self, $cmdname,
-                                            $command, $element);
+                                            $command, $tree_unit);
   }
 
   my $heading_level;
   # FIXME this is done as in texi2html: node is used as heading if there 
   # is nothing else.  Is it right?
   if ($cmdname eq 'node') {
-    if (!$element or (!$element->{'extra'}->{'section'}
-                      and $element->{'extra'}->{'node'}
-                      and $element->{'extra'}->{'node'} eq $command
-                      # bogus node may not have been normalized
-                      and defined($command->{'extra'}->{'normalized'}))) {
+    if (!$tree_unit or (!$tree_unit->{'extra'}->{'section'}
+                        and $tree_unit->{'extra'}->{'node'}
+                        and $tree_unit->{'extra'}->{'node'} eq $command
+                        # bogus node may not have been normalized
+                        and defined($command->{'extra'}->{'normalized'}))) {
       if ($command->{'extra'}->{'normalized'} eq 'Top') {
         $heading_level = 0;
       } else {
@@ -283,7 +279,7 @@ sub book_element_file_name($$$)
   my $new_file_name;
   my $command = $element->{'extra'}->{'section'};
   return undef unless ($command);
-  if ($converter->element_is_top($element)) {
+  if ($converter->element_is_tree_unit_top($element)) {
     $new_file_name = "${prefix}_top.html";
   } elsif (defined($command->{'number'}) and ($command->{'number'} ne '')) {
     my $number = $command->{'number'};
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index 186ae5f..273b826 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -251,10 +251,10 @@ sub chm_init($)
         my $file = $self->command_filename($index_entry_ref->{'command'});
         # happens for things in @titlepage when it is not output
         if (!defined($file)) {
-          if ($self->{'elements'} and $self->{'elements'}->[0]
-             and defined($self->{'elements'}->[0]->{'filename'})) {
+          if ($self->{'tree_units'} and $self->{'tree_units'}->[0]
+             and defined($self->{'tree_units'}->[0]->{'filename'})) {
             # In that case use the first page.
-            $file = $self->{'elements'}->[0]->{'filename'};
+            $file = $self->{'tree_units'}->[0]->{'filename'};
           } else {
             $file = '';
           }
@@ -375,9 +375,9 @@ sub chm_init($)
   my $title = convert_tree($self, $self->{'title_tree'});
   my $top_file = '';
   my $top_element = $self->global_element('Top');
-  if ($top_element and $top_element->{'extra'}->{'element_command'}) {
+  if ($top_element and $top_element->{'extra'}->{'unit_command'}) {
     $top_file 
-     = $self->command_filename($top_element->{'extra'}->{'element_command'});
+     = $self->command_filename($top_element->{'extra'}->{'unit_command'});
   }
 
   print $hhp_fh <<EOT;
@@ -400,8 +400,8 @@ 
Default=,"$hhc_filename","$hhk_filename","$top_file","$top_file",,,,,0x22520,,0x
 EOT
 
   my %chm_files;
-  if ($self->{'elements'}) {
-    foreach my $element (@{$self->{'elements'}}) {
+  if ($self->{'tree_units'}) {
+    foreach my $element (@{$self->{'tree_units'}}) {
       if (!$chm_files{$element->{'filename'}}) {
         print $hhp_fh "$element->{'filename'}\n";
         $chm_files{$element->{'filename'}} = 1;
diff --git a/tp/t/init/mini_ker_t2h.init b/tp/t/init/mini_ker_t2h.init
index 555d2de..2a28834 100644
--- a/tp/t/init/mini_ker_t2h.init
+++ b/tp/t/init/mini_ker_t2h.init
@@ -3,31 +3,31 @@ texinfo_set_from_init_file('shortcontents', 1);
 sub mini_ker_element_type($$$$)
 {
   my $self = shift;
-  my $cmdname = shift;
+  my $type = shift;
   my $command = shift;
   my $content = shift;
 
-  if ($self->element_is_top($command)) {
+  if ($self->element_is_tree_unit_top($command)) {
     my $result = '';
     $result .= &{$self->{'format_navigation_header'}}($self,
-          $self->get_conf('MISC_BUTTONS'), $cmdname, $command)
+          $self->get_conf('MISC_BUTTONS'), $type, $command)
       if ($self->get_conf('SPLIT') or $self->get_conf('HEADERS'));
     $result .= &{$self->{'format_titlepage'}}($self);
     my $overview = &{$self->{'format_contents'}}($self, 'shortcontents', 
undef);
     if ($overview) {
-      $result .= '<h2> ' .$self->convert_tree($self->gdt('Overview:')) 
+      $result .= '<h2> ' .$self->convert_tree($self->gdt('Overview:'))
                   . "</h2>\n" . "<blockquote>\n";
       $result .= $overview;;
       $result .= "</blockquote>\n";
     }
     $result .= 
&{$self->default_formatting_function('format_element_footer')}($self,
-                                                 $cmdname, $command, $content);
+                                                 $type, $command, $content);
     return $result;
   } else {
-    return &{$self->default_types_conversion($cmdname)}($self, 
-        $cmdname, $command, $content);
+    return &{$self->default_types_conversion($type)}($self,
+        $type, $command, $content);
   }
 }
 
-texinfo_register_type_formatting('element', \&mini_ker_element_type);
+texinfo_register_type_formatting('unit', \&mini_ker_element_type);
 
diff --git a/tp/t/init/misc_file_collision.init 
b/tp/t/init/misc_file_collision.init
index a25caea..12e1af6 100644
--- a/tp/t/init/misc_file_collision.init
+++ b/tp/t/init/misc_file_collision.init
@@ -10,9 +10,9 @@ sub test_misc_file_name($$$)
   my $element = shift;
   my $filename = shift;
 
-  if ($converter->element_is_top($element)
-      or ($converter->{'elements'}->[2] 
-          and $converter->{'elements'}->[2] eq $element)) {
+  if ($converter->element_is_tree_unit_top($element)
+      or ($converter->{'tree_units'}->[2]
+          and $converter->{'tree_units'}->[2] eq $element)) {
     my $extension = $converter->get_conf('EXTENSION');
     my $prefix = $converter->{'document_name'};
     $filename = "${prefix}_abt"
diff --git a/tp/t/init/t2h_singular.init b/tp/t/init/t2h_singular.init
index 557c4d0..0d3f59f 100644
--- a/tp/t/init/t2h_singular.init
+++ b/tp/t/init/t2h_singular.init
@@ -58,14 +58,14 @@ sub singular_format_footer($$$$)
   my $content = shift;
 
 
-  my $end_page = (!$element->{'element_next'}
+  my $end_page = (!$element->{'unit_next'}
        or (defined($element->{'filename'})
-           and $element->{'filename'} ne 
$element->{'element_next'}->{'filename'}
+           and $element->{'filename'} ne $element->{'unit_next'}->{'filename'}
            and $self->{'file_counters'}->{$element->{'filename'}} == 1));
 
-  if ($self->element_is_top($element)) {
+  if ($self->element_is_tree_unit_top($element)) {
     my $buttons = $self->get_conf('TOP_BUTTONS');
-    my $content_href = $self->_element_direction($element, 'Contents', 
+    my $content_href = $self->_element_direction($element, 'Contents',
                                                'href');
     my $about_href = $self->_element_direction($element, 'About',
                                                'href');
@@ -87,7 +87,7 @@ sub singular_format_footer($$$$)
        if (defined($self->get_conf('DEFAULT_RULE')));
     if ($end_page) {
       $result .= join('', $self->close_registered_sections_level(0));
-      $result .= &{$self->{'format_navigation_header_panel'}}($self, 
+      $result .= &{$self->{'format_navigation_header_panel'}}($self,
                                             $buttons, undef, $element);
     }
     return $result;
@@ -141,8 +141,8 @@ texinfo_set_from_init_file('VERTICAL_HEAD_NAVIGATION', 1);
 my @SECTION_BUTTONS =
   (
    \&singular_banner,
-   'Back', 'Forward',   'FastBack', 'FastForward',   
-   'Up', 'Top', 'Contents', 'Index', 'About' 
+   'Back', 'Forward',   'FastBack', 'FastForward',
+   'Up', 'Top', 'Contents', 'Index', 'About'
   );
 
 texinfo_set_from_init_file ('SECTION_BUTTONS', \@SECTION_BUTTONS);
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index a4e68a9..760ddee 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -129,11 +129,11 @@ $result_trees{'footnotestyle_separate_late'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -262,13 +262,13 @@ $result_trees{'footnotestyle_separate_late'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -428,13 +428,13 @@ $result_trees{'footnotestyle_separate_late'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -451,9 +451,9 @@ 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[2]{'args'}[0]{'conte
 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[0]{'contents'}[2];
 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[0]{'contents'}[2];
 $result_trees{'footnotestyle_separate_late'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'footnotestyle_separate_late'}[0];
-$result_trees{'footnotestyle_separate_late'}[0]{'extra'}{'element_command'} = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1];
 $result_trees{'footnotestyle_separate_late'}[0]{'extra'}{'node'} = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1];
 $result_trees{'footnotestyle_separate_late'}[0]{'extra'}{'section'} = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[2];
+$result_trees{'footnotestyle_separate_late'}[0]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[1];
 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -470,10 +470,10 @@ 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1]{'contents'}[1]{'c
 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1];
 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1];
 $result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'footnotestyle_separate_late'}[1];
-$result_trees{'footnotestyle_separate_late'}[1]{'element_prev'} = 
$result_trees{'footnotestyle_separate_late'}[0];
-$result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'element_command'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'node'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'section'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1];
+$result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0];
+$result_trees{'footnotestyle_separate_late'}[1]{'unit_prev'} = 
$result_trees{'footnotestyle_separate_late'}[0];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -493,10 +493,10 @@ 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1]{'contents'}[3]{'a
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1];
 $result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'footnotestyle_separate_late'}[2];
-$result_trees{'footnotestyle_separate_late'}[2]{'element_prev'} = 
$result_trees{'footnotestyle_separate_late'}[1];
-$result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'element_command'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'node'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'section'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1];
+$result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
+$result_trees{'footnotestyle_separate_late'}[2]{'unit_prev'} = 
$result_trees{'footnotestyle_separate_late'}[1];
 
 $result_texis{'footnotestyle_separate_late'} = '@setfilename 
footnotestyle_separate_late.info
 
@@ -689,14 +689,13 @@ $result_elements{'footnotestyle_separate_late'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
+                  'node' => {
                     'cmdname' => 'node',
                     'extra' => {
                       'normalized' => 'chap-s',
                       'spaces_before_argument' => ' '
                     }
                   },
-                  'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
                     'extra' => {
@@ -704,9 +703,10 @@ $result_elements{'footnotestyle_separate_late'} = [
                     },
                     'level' => 1,
                     'number' => 2
-                  }
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
@@ -718,14 +718,13 @@ $result_elements{'footnotestyle_separate_late'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'chap-f',
                 'spaces_before_argument' => ' '
               }
             },
-            'node' => {},
             'section' => {
               'cmdname' => 'chapter',
               'extra' => {
@@ -733,32 +732,33 @@ $result_elements{'footnotestyle_separate_late'} = [
               },
               'level' => 1,
               'number' => 1
-            }
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {
         'cmdname' => 'node',
         'extra' => {
           'normalized' => 'Top',
           'spaces_before_argument' => ' '
         }
       },
-      'node' => {},
       'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -773,7 +773,7 @@ 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastF
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'footnotestyle_separate_late'}[0];
-$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'footnotestyle_separate_late'}[0];
@@ -783,12 +783,12 @@ 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastF
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'footnotestyle_separate_late'}[0];
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'footnotestyle_separate_late'}[0];
-$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'footnotestyle_separate_late'}[0];
-$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'node'} = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'element_command'};
+$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'unit_command'} = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'node'};
 $result_elements{'footnotestyle_separate_late'}[1] = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'footnotestyle_separate_late'}[2] = 
$result_elements{'footnotestyle_separate_late'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index d419c53..cb4c6b6 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -52,10 +52,10 @@ $result_trees{'index_below'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -98,12 +98,12 @@ $result_trees{'index_below'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -216,12 +216,12 @@ $result_trees{'index_below'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'index_below'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[0];
@@ -229,15 +229,15 @@ 
$result_trees{'index_below'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent
 $result_trees{'index_below'}[0]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'index_below'}[0]{'contents'}[1];
 $result_trees{'index_below'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[0]{'contents'}[1];
 $result_trees{'index_below'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'index_below'}[0];
-$result_trees{'index_below'}[0]{'extra'}{'element_command'} = 
$result_trees{'index_below'}[0]{'contents'}[1];
 $result_trees{'index_below'}[0]{'extra'}{'section'} = 
$result_trees{'index_below'}[0]{'contents'}[1];
+$result_trees{'index_below'}[0]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[0]{'contents'}[1];
 
$result_trees{'index_below'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_below'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'index_below'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
 $result_trees{'index_below'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
 $result_trees{'index_below'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[1];
-$result_trees{'index_below'}[1]{'element_prev'} = 
$result_trees{'index_below'}[0];
-$result_trees{'index_below'}[1]{'extra'}{'element_command'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
 $result_trees{'index_below'}[1]{'extra'}{'section'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
+$result_trees{'index_below'}[1]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
+$result_trees{'index_below'}[1]{'unit_prev'} = $result_trees{'index_below'}[0];
 
$result_trees{'index_below'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_below'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'index_below'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
 $result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
@@ -251,9 +251,9 @@ 
$result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'conten
 
$result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[2];
 $result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
 $result_trees{'index_below'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[2];
-$result_trees{'index_below'}[2]{'element_prev'} = 
$result_trees{'index_below'}[1];
-$result_trees{'index_below'}[2]{'extra'}{'element_command'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
 $result_trees{'index_below'}[2]{'extra'}{'section'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
+$result_trees{'index_below'}[2]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
+$result_trees{'index_below'}[2]{'unit_prev'} = $result_trees{'index_below'}[1];
 
 $result_texis{'index_below'} = '@top top
 
@@ -350,7 +350,7 @@ $result_elements{'index_below'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'section',
                     'extra' => {
                       'spaces_before_argument' => ' '
@@ -358,14 +358,14 @@ $result_elements{'index_below'} = [
                     'level' => 2,
                     'number' => '1.1'
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
@@ -373,23 +373,23 @@ $result_elements{'index_below'} = [
               'level' => 1,
               'number' => 1
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -400,13 +400,13 @@ 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'
 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'section'}
 = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'section'};
 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = $result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'index_below'}[0];
-$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'index_below'}[0]{'extra'}{'directions'}{'Forward'} = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'index_below'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'index_below'}[0];
-$result_elements{'index_below'}[0]{'extra'}{'section'} = 
$result_elements{'index_below'}[0]{'extra'}{'element_command'};
+$result_elements{'index_below'}[0]{'extra'}{'unit_command'} = 
$result_elements{'index_below'}[0]{'extra'}{'section'};
 $result_elements{'index_below'}[1] = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'index_below'}[2] = 
$result_elements{'index_below'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
 
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 4d93ba7..e228f25 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -368,11 +368,11 @@ $result_trees{'redirection_same_labels'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -833,13 +833,13 @@ $result_trees{'redirection_same_labels'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1116,13 +1116,13 @@ $result_trees{'redirection_same_labels'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -1175,9 +1175,9 @@ 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'extra
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'redirection_same_labels'}[0]{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'redirection_same_labels'}[0]{'contents'}[2];
 $result_trees{'redirection_same_labels'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'redirection_same_labels'}[0];
-$result_trees{'redirection_same_labels'}[0]{'extra'}{'element_command'} = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2];
 $result_trees{'redirection_same_labels'}[0]{'extra'}{'node'} = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[1];
 $result_trees{'redirection_same_labels'}[0]{'extra'}{'section'} = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2];
+$result_trees{'redirection_same_labels'}[0]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'redirection_same_labels'}[1]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1239,10 +1239,10 @@ 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'contents'}[0]{'paren
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'redirection_same_labels'}[1];
-$result_trees{'redirection_same_labels'}[1]{'element_prev'} = 
$result_trees{'redirection_same_labels'}[0];
-$result_trees{'redirection_same_labels'}[1]{'extra'}{'element_command'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1];
 $result_trees{'redirection_same_labels'}[1]{'extra'}{'node'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[1]{'extra'}{'section'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1];
+$result_trees{'redirection_same_labels'}[1]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1];
+$result_trees{'redirection_same_labels'}[1]{'unit_prev'} = 
$result_trees{'redirection_same_labels'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'redirection_same_labels'}[2]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1279,10 +1279,10 @@ 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'redirection_same_labels'}[2];
-$result_trees{'redirection_same_labels'}[2]{'element_prev'} = 
$result_trees{'redirection_same_labels'}[1];
-$result_trees{'redirection_same_labels'}[2]{'extra'}{'element_command'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'node'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'section'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];
+$result_trees{'redirection_same_labels'}[2]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];
+$result_trees{'redirection_same_labels'}[2]{'unit_prev'} = 
$result_trees{'redirection_same_labels'}[1];
 
 $result_texis{'redirection_same_labels'} = '@setfilename 
redirection_same_labels.info
 
@@ -1639,14 +1639,6 @@ $result_elements{'redirection_same_labels'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
-                    'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'level' => 1,
-                    'number' => 2
-                  },
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -1711,9 +1703,17 @@ $result_elements{'redirection_same_labels'} = [
                       'Top' => 1
                     }
                   },
-                  'section' => {}
+                  'section' => {
+                    'cmdname' => 'chapter',
+                    'extra' => {
+                      'spaces_before_argument' => ' '
+                    },
+                    'level' => 1,
+                    'number' => 2
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
@@ -1725,7 +1725,8 @@ $result_elements{'redirection_same_labels'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'node' => {},
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
@@ -1733,27 +1734,26 @@ $result_elements{'redirection_same_labels'} = [
               'level' => 1,
               'number' => 1
             },
-            'node' => {},
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -1776,7 +1776,7 @@ 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForwa
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'redirection_same_labels'}[0];
@@ -1787,13 +1787,13 @@ 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForwa
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'redirection_same_labels'}[0];
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'This'} 
= $result_elements{'redirection_same_labels'}[0];
 $result_elements{'redirection_same_labels'}[0]{'extra'}{'node'} = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'redirection_same_labels'}[0]{'extra'}{'section'} = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'element_command'};
+$result_elements{'redirection_same_labels'}[0]{'extra'}{'unit_command'} = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'section'};
 $result_elements{'redirection_same_labels'}[1] = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'redirection_same_labels'}[2] = 
$result_elements{'redirection_same_labels'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
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 2781481..03bebe2 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -53,10 +53,10 @@ $result_trees{'chapter_before_and_after_part'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -154,12 +154,12 @@ $result_trees{'chapter_before_and_after_part'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'chapter_before_and_after_part'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_before_and_after_part'}[0];
@@ -167,8 +167,8 @@ 
$result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1]{'args'}[0]{'con
 
$result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1];
 
$result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1];
 $result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'chapter_before_and_after_part'}[0];
-$result_trees{'chapter_before_and_after_part'}[0]{'extra'}{'element_command'} 
= $result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1];
 $result_trees{'chapter_before_and_after_part'}[0]{'extra'}{'section'} = 
$result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1];
+$result_trees{'chapter_before_and_after_part'}[0]{'extra'}{'unit_command'} = 
$result_trees{'chapter_before_and_after_part'}[0]{'contents'}[1];
 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[0];
 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[0];
@@ -180,9 +180,9 @@ 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1]{'contents'}[1]{
 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1];
 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1]{'extra'}{'associated_part'}
 = $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[0];
 $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'chapter_before_and_after_part'}[1];
-$result_trees{'chapter_before_and_after_part'}[1]{'element_prev'} = 
$result_trees{'chapter_before_and_after_part'}[0];
-$result_trees{'chapter_before_and_after_part'}[1]{'extra'}{'element_command'} 
= $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1];
 $result_trees{'chapter_before_and_after_part'}[1]{'extra'}{'section'} = 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1];
+$result_trees{'chapter_before_and_after_part'}[1]{'extra'}{'unit_command'} = 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1];
+$result_trees{'chapter_before_and_after_part'}[1]{'unit_prev'} = 
$result_trees{'chapter_before_and_after_part'}[0];
 
 $result_texis{'chapter_before_and_after_part'} = '@chapter chapter
 
@@ -265,7 +265,7 @@ $result_elements{'chapter_before_and_after_part'} = [
               'FastBack' => {},
               'This' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'associated_part' => {
@@ -280,14 +280,14 @@ $result_elements{'chapter_before_and_after_part'} = [
               'level' => 1,
               'number' => 2
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'chapter',
         'extra' => {
           'spaces_before_argument' => ' '
@@ -295,19 +295,19 @@ $result_elements{'chapter_before_and_after_part'} = [
         'level' => 1,
         'number' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = $result_elements{'chapter_before_and_after_part'}[0];
 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'chapter_before_and_after_part'}[0];
 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'chapter_before_and_after_part'}[0];
-$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'section'} = 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'element_command'};
+$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'unit_command'} 
= $result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'section'};
 $result_elements{'chapter_before_and_after_part'}[1] = 
$result_elements{'chapter_before_and_after_part'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index ffd4a42..6acfeb1 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -53,10 +53,10 @@ $result_trees{'chapter_before_part'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -91,12 +91,12 @@ $result_trees{'chapter_before_part'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'chapter_before_part'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_before_part'}[0];
@@ -104,14 +104,14 @@ 
$result_trees{'chapter_before_part'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]
 $result_trees{'chapter_before_part'}[0]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'chapter_before_part'}[0]{'contents'}[1];
 
$result_trees{'chapter_before_part'}[0]{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'chapter_before_part'}[0]{'contents'}[1];
 $result_trees{'chapter_before_part'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'chapter_before_part'}[0];
-$result_trees{'chapter_before_part'}[0]{'extra'}{'element_command'} = 
$result_trees{'chapter_before_part'}[0]{'contents'}[1];
 $result_trees{'chapter_before_part'}[0]{'extra'}{'section'} = 
$result_trees{'chapter_before_part'}[0]{'contents'}[1];
+$result_trees{'chapter_before_part'}[0]{'extra'}{'unit_command'} = 
$result_trees{'chapter_before_part'}[0]{'contents'}[1];
 
$result_trees{'chapter_before_part'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_before_part'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_before_part'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_before_part'}[1]{'contents'}[0];
 $result_trees{'chapter_before_part'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_before_part'}[1];
-$result_trees{'chapter_before_part'}[1]{'element_prev'} = 
$result_trees{'chapter_before_part'}[0];
-$result_trees{'chapter_before_part'}[1]{'extra'}{'element_command'} = 
$result_trees{'chapter_before_part'}[1]{'contents'}[0];
 $result_trees{'chapter_before_part'}[1]{'extra'}{'section'} = 
$result_trees{'chapter_before_part'}[1]{'contents'}[0];
+$result_trees{'chapter_before_part'}[1]{'extra'}{'unit_command'} = 
$result_trees{'chapter_before_part'}[1]{'contents'}[0];
+$result_trees{'chapter_before_part'}[1]{'unit_prev'} = 
$result_trees{'chapter_before_part'}[0];
 
 $result_texis{'chapter_before_part'} = '@chapter chapter
 
@@ -177,20 +177,20 @@ $result_elements{'chapter_before_part'} = [
               'Back' => {},
               'This' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'part',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'level' => 0
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'chapter',
         'extra' => {
           'spaces_before_argument' => ' '
@@ -198,17 +198,17 @@ $result_elements{'chapter_before_part'} = [
         'level' => 1,
         'number' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
 
$result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Back'}
 = $result_elements{'chapter_before_part'}[0];
 
$result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = $result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'section'}
 = 
$result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'section'};
 $result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'chapter_before_part'}[0];
-$result_elements{'chapter_before_part'}[0]{'extra'}{'section'} = 
$result_elements{'chapter_before_part'}[0]{'extra'}{'element_command'};
+$result_elements{'chapter_before_part'}[0]{'extra'}{'unit_command'} = 
$result_elements{'chapter_before_part'}[0]{'extra'}{'section'};
 $result_elements{'chapter_before_part'}[1] = 
$result_elements{'chapter_before_part'}[0]{'extra'}{'directions'}{'Forward'};
 
 
diff --git a/tp/t/results/sectioning/chapter_sections.pl 
b/tp/t/results/sectioning/chapter_sections.pl
index aca091a..d8be1fc 100644
--- a/tp/t/results/sectioning/chapter_sections.pl
+++ b/tp/t/results/sectioning/chapter_sections.pl
@@ -52,10 +52,10 @@ $result_trees{'chapter_sections'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -98,12 +98,12 @@ $result_trees{'chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -146,12 +146,12 @@ $result_trees{'chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -194,12 +194,12 @@ $result_trees{'chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -242,12 +242,12 @@ $result_trees{'chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -290,12 +290,12 @@ $result_trees{'chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -338,12 +338,12 @@ $result_trees{'chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -379,12 +379,12 @@ $result_trees{'chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'chapter_sections'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[0];
@@ -392,56 +392,56 @@ 
$result_trees{'chapter_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'p
 $result_trees{'chapter_sections'}[0]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[0]{'contents'}[1];
 $result_trees{'chapter_sections'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[0]{'contents'}[1];
 $result_trees{'chapter_sections'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'chapter_sections'}[0];
-$result_trees{'chapter_sections'}[0]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[0]{'contents'}[1];
 $result_trees{'chapter_sections'}[0]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[0]{'contents'}[1];
+$result_trees{'chapter_sections'}[0]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[0]{'contents'}[1];
 
$result_trees{'chapter_sections'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[1]{'contents'}[0];
 $result_trees{'chapter_sections'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[1]{'contents'}[0];
 $result_trees{'chapter_sections'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[1];
-$result_trees{'chapter_sections'}[1]{'element_prev'} = 
$result_trees{'chapter_sections'}[0];
-$result_trees{'chapter_sections'}[1]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[1]{'contents'}[0];
 $result_trees{'chapter_sections'}[1]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[1]{'contents'}[0];
+$result_trees{'chapter_sections'}[1]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[1]{'contents'}[0];
+$result_trees{'chapter_sections'}[1]{'unit_prev'} = 
$result_trees{'chapter_sections'}[0];
 
$result_trees{'chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
 $result_trees{'chapter_sections'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
 $result_trees{'chapter_sections'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[2];
-$result_trees{'chapter_sections'}[2]{'element_prev'} = 
$result_trees{'chapter_sections'}[1];
-$result_trees{'chapter_sections'}[2]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
 $result_trees{'chapter_sections'}[2]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
+$result_trees{'chapter_sections'}[2]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
+$result_trees{'chapter_sections'}[2]{'unit_prev'} = 
$result_trees{'chapter_sections'}[1];
 
$result_trees{'chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
 $result_trees{'chapter_sections'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
 $result_trees{'chapter_sections'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[3];
-$result_trees{'chapter_sections'}[3]{'element_prev'} = 
$result_trees{'chapter_sections'}[2];
-$result_trees{'chapter_sections'}[3]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
 $result_trees{'chapter_sections'}[3]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
+$result_trees{'chapter_sections'}[3]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
+$result_trees{'chapter_sections'}[3]{'unit_prev'} = 
$result_trees{'chapter_sections'}[2];
 
$result_trees{'chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
 $result_trees{'chapter_sections'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
 $result_trees{'chapter_sections'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[4];
-$result_trees{'chapter_sections'}[4]{'element_prev'} = 
$result_trees{'chapter_sections'}[3];
-$result_trees{'chapter_sections'}[4]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
 $result_trees{'chapter_sections'}[4]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
+$result_trees{'chapter_sections'}[4]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
+$result_trees{'chapter_sections'}[4]{'unit_prev'} = 
$result_trees{'chapter_sections'}[3];
 
$result_trees{'chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
 $result_trees{'chapter_sections'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
 $result_trees{'chapter_sections'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[5];
-$result_trees{'chapter_sections'}[5]{'element_prev'} = 
$result_trees{'chapter_sections'}[4];
-$result_trees{'chapter_sections'}[5]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
 $result_trees{'chapter_sections'}[5]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
+$result_trees{'chapter_sections'}[5]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
+$result_trees{'chapter_sections'}[5]{'unit_prev'} = 
$result_trees{'chapter_sections'}[4];
 
$result_trees{'chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
 $result_trees{'chapter_sections'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
 $result_trees{'chapter_sections'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[6];
-$result_trees{'chapter_sections'}[6]{'element_prev'} = 
$result_trees{'chapter_sections'}[5];
-$result_trees{'chapter_sections'}[6]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
 $result_trees{'chapter_sections'}[6]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
+$result_trees{'chapter_sections'}[6]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
+$result_trees{'chapter_sections'}[6]{'unit_prev'} = 
$result_trees{'chapter_sections'}[5];
 
$result_trees{'chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[7]{'contents'}[0];
 $result_trees{'chapter_sections'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[7];
-$result_trees{'chapter_sections'}[7]{'element_prev'} = 
$result_trees{'chapter_sections'}[6];
-$result_trees{'chapter_sections'}[7]{'extra'}{'element_command'} = 
$result_trees{'chapter_sections'}[7]{'contents'}[0];
 $result_trees{'chapter_sections'}[7]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[7]{'contents'}[0];
+$result_trees{'chapter_sections'}[7]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[7]{'contents'}[0];
+$result_trees{'chapter_sections'}[7]{'unit_prev'} = 
$result_trees{'chapter_sections'}[6];
 
 $result_texis{'chapter_sections'} = '@unnumbered unnumbered
 
@@ -619,7 +619,7 @@ $result_elements{'chapter_sections'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'section' => {
                           'cmdname' => 'section',
                           'extra' => {
                             'spaces_before_argument' => ' '
@@ -627,9 +627,9 @@ $result_elements{'chapter_sections'} = [
                           'level' => 2,
                           'number' => '1.1'
                         },
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'FastBack' => {},
                     'FastForward' => {
@@ -651,7 +651,7 @@ $result_elements{'chapter_sections'} = [
                                             'This' => {},
                                             'Up' => {}
                                           },
-                                          'element_command' => {
+                                          'section' => {
                                             'cmdname' => 'section',
                                             'extra' => {
                                               'spaces_before_argument' => ' '
@@ -659,9 +659,9 @@ $result_elements{'chapter_sections'} = [
                                             'level' => 2,
                                             'number' => '2.1'
                                           },
-                                          'section' => {}
+                                          'unit_command' => {}
                                         },
-                                        'type' => 'element'
+                                        'type' => 'unit'
                                       },
                                       'FastBack' => {},
                                       'FastForward' => {},
@@ -670,7 +670,7 @@ $result_elements{'chapter_sections'} = [
                                       'This' => {},
                                       'Up' => {}
                                     },
-                                    'element_command' => {
+                                    'section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {
                                         'spaces_before_argument' => ' '
@@ -678,9 +678,9 @@ $result_elements{'chapter_sections'} = [
                                       'level' => 3,
                                       'number' => '2.1.1'
                                     },
-                                    'section' => {}
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'FastBack' => {},
                                 'FastForward' => {},
@@ -689,7 +689,7 @@ $result_elements{'chapter_sections'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'section' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
@@ -697,15 +697,15 @@ $result_elements{'chapter_sections'} = [
                                 'level' => 3,
                                 'number' => '2.1.2'
                               },
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'FastBack' => {},
                           'Prev' => {},
                           'This' => {}
                         },
-                        'element_command' => {
+                        'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
                             'spaces_before_argument' => ' '
@@ -713,16 +713,16 @@ $result_elements{'chapter_sections'} = [
                           'level' => 1,
                           'number' => 3
                         },
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'Forward' => {},
                     'Next' => {},
                     'Prev' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'chapter',
                     'extra' => {
                       'spaces_before_argument' => ' '
@@ -730,16 +730,16 @@ $result_elements{'chapter_sections'} = [
                     'level' => 1,
                     'number' => 2
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
               'Prev' => {},
               'This' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
@@ -747,24 +747,24 @@ $result_elements{'chapter_sections'} = [
               'level' => 1,
               'number' => 1
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'unnumbered',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -782,7 +782,7 @@ 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'e
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -790,39 +790,39 @@ 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'e
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Bac
 [...]
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'
 [...]
+$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'e
 [...]
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
-$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
-$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = $result_elements{'chapter_sections'}[0];
 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'Forward'} = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'Next'} = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'chapter_sections'}[0];
-$result_elements{'chapter_sections'}[0]{'extra'}{'section'} = 
$result_elements{'chapter_sections'}[0]{'extra'}{'element_command'};
+$result_elements{'chapter_sections'}[0]{'extra'}{'unit_command'} = 
$result_elements{'chapter_sections'}[0]{'extra'}{'section'};
 $result_elements{'chapter_sections'}[1] = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'chapter_sections'}[2] = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 $result_elements{'chapter_sections'}[3] = 
$result_elements{'chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
index e8d25c3..9b0acab 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
@@ -682,7 +682,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       'contents' => [
                         {}
                       ],
-                      'element_prev' => {
+                      'extra' => {
+                        'node' => {},
+                        'unit_command' => {}
+                      },
+                      'type' => 'unit',
+                      'unit_prev' => {
                         'contents' => [
                           {
                             'args' => [
@@ -1049,19 +1054,14 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                             'parent' => {}
                           }
                         ],
-                        'element_prev' => {},
                         'extra' => {
-                          'element_command' => {},
                           'node' => {},
-                          'section' => {}
+                          'section' => {},
+                          'unit_command' => {}
                         },
-                        'type' => 'element'
-                      },
-                      'extra' => {
-                        'element_command' => {},
-                        'node' => {}
-                      },
-                      'type' => 'element'
+                        'type' => 'unit',
+                        'unit_prev' => {}
+                      }
                     }
                   },
                   'node_argument' => {
@@ -1198,12 +1198,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       'contents' => [
                         {}
                       ],
-                      'element_prev' => {},
                       'extra' => {
-                        'element_command' => {},
-                        'node' => {}
+                        'node' => {},
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit',
+                      'unit_prev' => {}
                     }
                   },
                   'node_argument' => {
@@ -1383,12 +1383,12 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                           'parent' => {}
                         }
                       ],
-                      'element_prev' => {},
                       'extra' => {
-                        'element_command' => {},
-                        'node' => {}
+                        'node' => {},
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit',
+                      'unit_prev' => {}
                     }
                   },
                   'node_argument' => {
@@ -1434,11 +1434,11 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -1544,68 +1544,68 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'element_prev'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'extra'}{'element_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'extra'}{'section'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'extra'}{'element_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'args'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'extra'}{'section'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'unit_prev'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
@@ -1626,9 +1626,9 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[2]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'args'}[3]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'element_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'extra'}{'element_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'unit_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
@@ -1655,19 +1655,19 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'element_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'extra'}{'element_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'unit_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[7]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'character_and_spaces_in_refs_out'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'element_command'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'} = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'section'} = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[1] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'element_prev'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'unit_command'} 
= $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[1] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'};
 $result_trees{'character_and_spaces_in_refs_out'}[2] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'};
 $result_trees{'character_and_spaces_in_refs_out'}[3] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'};
 $result_trees{'character_and_spaces_in_refs_out'}[4] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'};
@@ -1989,7 +1989,7 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                                 'NodeUp' => {},
                                 'This' => {}
                               },
-                              'element_command' => {
+                              'node' => {
                                 'cmdname' => 'node',
                                 'extra' => {
                                   'normalized' => 'local-node',
@@ -2042,9 +2042,9 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                                   'other-nodes' => 1
                                 }
                               },
-                              'node' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'NodeBack' => {},
                           'NodeForward' => {},
@@ -2053,10 +2053,10 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                           'NodeUp' => {},
                           'This' => {}
                         },
-                        'element_command' => {},
-                        'node' => {}
+                        'node' => {},
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'NodeBack' => {},
                     'NodeForward' => {},
@@ -2065,10 +2065,10 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {},
-                  'node' => {}
+                  'node' => {},
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'NodeBack' => {},
               'NodeForward' => {},
@@ -2078,7 +2078,6 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {},
             'node' => {},
             'section' => {
               'cmdname' => 'chapter',
@@ -2087,16 +2086,16 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
               },
               'level' => 1,
               'number' => 1
-            }
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
       'node' => {},
       'section' => {
         'cmdname' => 'top',
@@ -2104,9 +2103,10 @@ $result_elements{'character_and_spaces_in_refs_out'} = [
           'spaces_before_argument' => ' '
         },
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -2126,29 +2126,29 @@ 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'me
 [...]
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_c
 [...]
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}
 [...]
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu
 [...]
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{
 [...]
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'m
 [...]
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0];
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
@@ -2156,14 +2156,14 @@ 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0];
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0];
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'character_and_spaces_in_refs_out'}[0];
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'};
-$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'} = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'} = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'};
+$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_up'};
 $result_elements{'character_and_spaces_in_refs_out'}[1] = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'character_and_spaces_in_refs_out'}[2] = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
 $result_elements{'character_and_spaces_in_refs_out'}[3] = 
$result_elements{'character_and_spaces_in_refs_out'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index da92368..da418eb 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -520,11 +520,11 @@ $result_trees{'complex'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -905,13 +905,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1281,13 +1281,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1370,13 +1370,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1459,13 +1459,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1548,13 +1548,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1637,13 +1637,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1842,13 +1842,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1937,13 +1937,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2120,13 +2120,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2289,13 +2289,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2395,13 +2395,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2676,13 +2676,13 @@ $result_trees{'complex'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'complex'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[0];
@@ -2769,9 +2769,9 @@ 
$result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'
 $result_trees{'complex'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[0]{'contents'}[2];
 $result_trees{'complex'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[0]{'contents'}[2];
 $result_trees{'complex'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[0];
-$result_trees{'complex'}[0]{'extra'}{'element_command'} = 
$result_trees{'complex'}[0]{'contents'}[2];
 $result_trees{'complex'}[0]{'extra'}{'node'} = 
$result_trees{'complex'}[0]{'contents'}[1];
 $result_trees{'complex'}[0]{'extra'}{'section'} = 
$result_trees{'complex'}[0]{'contents'}[2];
+$result_trees{'complex'}[0]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[0]{'contents'}[2];
 $result_trees{'complex'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[1]{'contents'}[0];
 $result_trees{'complex'}[1]{'contents'}[0]{'args'}[1]{'parent'} = 
$result_trees{'complex'}[1]{'contents'}[0];
@@ -2831,10 +2831,10 @@ 
$result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'
 $result_trees{'complex'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[1]{'contents'}[1];
 $result_trees{'complex'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'complex'}[1]{'contents'}[1];
 $result_trees{'complex'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[1];
-$result_trees{'complex'}[1]{'element_prev'} = $result_trees{'complex'}[0];
-$result_trees{'complex'}[1]{'extra'}{'element_command'} = 
$result_trees{'complex'}[1]{'contents'}[1];
 $result_trees{'complex'}[1]{'extra'}{'node'} = 
$result_trees{'complex'}[1]{'contents'}[0];
 $result_trees{'complex'}[1]{'extra'}{'section'} = 
$result_trees{'complex'}[1]{'contents'}[1];
+$result_trees{'complex'}[1]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[1]{'contents'}[1];
+$result_trees{'complex'}[1]{'unit_prev'} = $result_trees{'complex'}[0];
 $result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[2]{'contents'}[0];
 $result_trees{'complex'}[2]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2892,10 +2892,10 @@ 
$result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'
 $result_trees{'complex'}[2]{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[2]{'contents'}[1];
 $result_trees{'complex'}[2]{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[2]{'contents'}[1];
 $result_trees{'complex'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[2];
-$result_trees{'complex'}[2]{'element_prev'} = $result_trees{'complex'}[1];
-$result_trees{'complex'}[2]{'extra'}{'element_command'} = 
$result_trees{'complex'}[2]{'contents'}[1];
 $result_trees{'complex'}[2]{'extra'}{'node'} = 
$result_trees{'complex'}[2]{'contents'}[0];
 $result_trees{'complex'}[2]{'extra'}{'section'} = 
$result_trees{'complex'}[2]{'contents'}[1];
+$result_trees{'complex'}[2]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[2]{'contents'}[1];
+$result_trees{'complex'}[2]{'unit_prev'} = $result_trees{'complex'}[1];
 $result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[3]{'contents'}[0];
 $result_trees{'complex'}[3]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2905,10 +2905,10 @@ 
$result_trees{'complex'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} =
 $result_trees{'complex'}[3]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[3]{'contents'}[1];
 $result_trees{'complex'}[3]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[3]{'contents'}[1];
 $result_trees{'complex'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[3];
-$result_trees{'complex'}[3]{'element_prev'} = $result_trees{'complex'}[2];
-$result_trees{'complex'}[3]{'extra'}{'element_command'} = 
$result_trees{'complex'}[3]{'contents'}[1];
 $result_trees{'complex'}[3]{'extra'}{'node'} = 
$result_trees{'complex'}[3]{'contents'}[0];
 $result_trees{'complex'}[3]{'extra'}{'section'} = 
$result_trees{'complex'}[3]{'contents'}[1];
+$result_trees{'complex'}[3]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[3]{'contents'}[1];
+$result_trees{'complex'}[3]{'unit_prev'} = $result_trees{'complex'}[2];
 $result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[4]{'contents'}[0];
 $result_trees{'complex'}[4]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2918,10 +2918,10 @@ 
$result_trees{'complex'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} =
 $result_trees{'complex'}[4]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[4]{'contents'}[1];
 $result_trees{'complex'}[4]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[4]{'contents'}[1];
 $result_trees{'complex'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[4];
-$result_trees{'complex'}[4]{'element_prev'} = $result_trees{'complex'}[3];
-$result_trees{'complex'}[4]{'extra'}{'element_command'} = 
$result_trees{'complex'}[4]{'contents'}[1];
 $result_trees{'complex'}[4]{'extra'}{'node'} = 
$result_trees{'complex'}[4]{'contents'}[0];
 $result_trees{'complex'}[4]{'extra'}{'section'} = 
$result_trees{'complex'}[4]{'contents'}[1];
+$result_trees{'complex'}[4]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[4]{'contents'}[1];
+$result_trees{'complex'}[4]{'unit_prev'} = $result_trees{'complex'}[3];
 $result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[5]{'contents'}[0];
 $result_trees{'complex'}[5]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2931,10 +2931,10 @@ 
$result_trees{'complex'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} =
 $result_trees{'complex'}[5]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[5]{'contents'}[1];
 $result_trees{'complex'}[5]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[5]{'contents'}[1];
 $result_trees{'complex'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[5];
-$result_trees{'complex'}[5]{'element_prev'} = $result_trees{'complex'}[4];
-$result_trees{'complex'}[5]{'extra'}{'element_command'} = 
$result_trees{'complex'}[5]{'contents'}[1];
 $result_trees{'complex'}[5]{'extra'}{'node'} = 
$result_trees{'complex'}[5]{'contents'}[0];
 $result_trees{'complex'}[5]{'extra'}{'section'} = 
$result_trees{'complex'}[5]{'contents'}[1];
+$result_trees{'complex'}[5]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[5]{'contents'}[1];
+$result_trees{'complex'}[5]{'unit_prev'} = $result_trees{'complex'}[4];
 $result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[6]{'contents'}[0];
 $result_trees{'complex'}[6]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2944,10 +2944,10 @@ 
$result_trees{'complex'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} =
 $result_trees{'complex'}[6]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[6]{'contents'}[1];
 $result_trees{'complex'}[6]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[6]{'contents'}[1];
 $result_trees{'complex'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[6];
-$result_trees{'complex'}[6]{'element_prev'} = $result_trees{'complex'}[5];
-$result_trees{'complex'}[6]{'extra'}{'element_command'} = 
$result_trees{'complex'}[6]{'contents'}[1];
 $result_trees{'complex'}[6]{'extra'}{'node'} = 
$result_trees{'complex'}[6]{'contents'}[0];
 $result_trees{'complex'}[6]{'extra'}{'section'} = 
$result_trees{'complex'}[6]{'contents'}[1];
+$result_trees{'complex'}[6]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[6]{'contents'}[1];
+$result_trees{'complex'}[6]{'unit_prev'} = $result_trees{'complex'}[5];
 $result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[7]{'contents'}[0];
 $result_trees{'complex'}[7]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2975,10 +2975,10 @@ 
$result_trees{'complex'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'
 $result_trees{'complex'}[7]{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[7]{'contents'}[1];
 $result_trees{'complex'}[7]{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[7]{'contents'}[1];
 $result_trees{'complex'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[7];
-$result_trees{'complex'}[7]{'element_prev'} = $result_trees{'complex'}[6];
-$result_trees{'complex'}[7]{'extra'}{'element_command'} = 
$result_trees{'complex'}[7]{'contents'}[1];
 $result_trees{'complex'}[7]{'extra'}{'node'} = 
$result_trees{'complex'}[7]{'contents'}[0];
 $result_trees{'complex'}[7]{'extra'}{'section'} = 
$result_trees{'complex'}[7]{'contents'}[1];
+$result_trees{'complex'}[7]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[7]{'contents'}[1];
+$result_trees{'complex'}[7]{'unit_prev'} = $result_trees{'complex'}[6];
 $result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[8]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[8]{'contents'}[0];
 $result_trees{'complex'}[8]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2989,10 +2989,10 @@ 
$result_trees{'complex'}[8]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{
 $result_trees{'complex'}[8]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[8]{'contents'}[1];
 $result_trees{'complex'}[8]{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[8]{'contents'}[1];
 $result_trees{'complex'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[8];
-$result_trees{'complex'}[8]{'element_prev'} = $result_trees{'complex'}[7];
-$result_trees{'complex'}[8]{'extra'}{'element_command'} = 
$result_trees{'complex'}[8]{'contents'}[1];
 $result_trees{'complex'}[8]{'extra'}{'node'} = 
$result_trees{'complex'}[8]{'contents'}[0];
 $result_trees{'complex'}[8]{'extra'}{'section'} = 
$result_trees{'complex'}[8]{'contents'}[1];
+$result_trees{'complex'}[8]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[8]{'contents'}[1];
+$result_trees{'complex'}[8]{'unit_prev'} = $result_trees{'complex'}[7];
 $result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[9]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[9]{'contents'}[0];
 $result_trees{'complex'}[9]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3016,10 +3016,10 @@ 
$result_trees{'complex'}[9]{'contents'}[2]{'extra'}{'node_content'}[0] = $result
 
$result_trees{'complex'}[9]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'complex'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex'}[9]{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'complex'}[9]{'contents'}[2]{'args'}[3]{'contents'}[0];
 $result_trees{'complex'}[9]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[9];
-$result_trees{'complex'}[9]{'element_prev'} = $result_trees{'complex'}[8];
-$result_trees{'complex'}[9]{'extra'}{'element_command'} = 
$result_trees{'complex'}[9]{'contents'}[1];
 $result_trees{'complex'}[9]{'extra'}{'node'} = 
$result_trees{'complex'}[9]{'contents'}[0];
 $result_trees{'complex'}[9]{'extra'}{'section'} = 
$result_trees{'complex'}[9]{'contents'}[1];
+$result_trees{'complex'}[9]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[9]{'contents'}[1];
+$result_trees{'complex'}[9]{'unit_prev'} = $result_trees{'complex'}[8];
 
$result_trees{'complex'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[10]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[10]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[10]{'contents'}[0];
 
$result_trees{'complex'}[10]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[10]{'contents'}[0]{'args'}[1];
@@ -3043,10 +3043,10 @@ 
$result_trees{'complex'}[10]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'paren
 $result_trees{'complex'}[10]{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[10]{'contents'}[1];
 $result_trees{'complex'}[10]{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[10]{'contents'}[1];
 $result_trees{'complex'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[10];
-$result_trees{'complex'}[10]{'element_prev'} = $result_trees{'complex'}[9];
-$result_trees{'complex'}[10]{'extra'}{'element_command'} = 
$result_trees{'complex'}[10]{'contents'}[1];
 $result_trees{'complex'}[10]{'extra'}{'node'} = 
$result_trees{'complex'}[10]{'contents'}[0];
 $result_trees{'complex'}[10]{'extra'}{'section'} = 
$result_trees{'complex'}[10]{'contents'}[1];
+$result_trees{'complex'}[10]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[10]{'contents'}[1];
+$result_trees{'complex'}[10]{'unit_prev'} = $result_trees{'complex'}[9];
 
$result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[11]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[11]{'contents'}[0];
 $result_trees{'complex'}[11]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3059,10 +3059,10 @@ 
$result_trees{'complex'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'paren
 $result_trees{'complex'}[11]{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[11]{'contents'}[1];
 $result_trees{'complex'}[11]{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[11]{'contents'}[1];
 $result_trees{'complex'}[11]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[11];
-$result_trees{'complex'}[11]{'element_prev'} = $result_trees{'complex'}[10];
-$result_trees{'complex'}[11]{'extra'}{'element_command'} = 
$result_trees{'complex'}[11]{'contents'}[1];
 $result_trees{'complex'}[11]{'extra'}{'node'} = 
$result_trees{'complex'}[11]{'contents'}[0];
 $result_trees{'complex'}[11]{'extra'}{'section'} = 
$result_trees{'complex'}[11]{'contents'}[1];
+$result_trees{'complex'}[11]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[11]{'contents'}[1];
+$result_trees{'complex'}[11]{'unit_prev'} = $result_trees{'complex'}[10];
 
$result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[12]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1];
@@ -3102,10 +3102,10 @@ 
$result_trees{'complex'}[12]{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_c
 $result_trees{'complex'}[12]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[12];
 $result_trees{'complex'}[12]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[12]{'contents'}[3];
 $result_trees{'complex'}[12]{'contents'}[3]{'parent'} = 
$result_trees{'complex'}[12];
-$result_trees{'complex'}[12]{'element_prev'} = $result_trees{'complex'}[11];
-$result_trees{'complex'}[12]{'extra'}{'element_command'} = 
$result_trees{'complex'}[12]{'contents'}[1];
 $result_trees{'complex'}[12]{'extra'}{'node'} = 
$result_trees{'complex'}[12]{'contents'}[0];
 $result_trees{'complex'}[12]{'extra'}{'section'} = 
$result_trees{'complex'}[12]{'contents'}[1];
+$result_trees{'complex'}[12]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[12]{'contents'}[1];
+$result_trees{'complex'}[12]{'unit_prev'} = $result_trees{'complex'}[11];
 
 $result_texis{'complex'} = '@node Top,First node,(dir)
 @top
@@ -4016,13 +4016,6 @@ $result_elements{'complex'} = [
                                                                     'This' => 
{},
                                                                     'Up' => {}
                                                                   },
-                                                                  
'element_command' => {
-                                                                    'cmdname' 
=> 'unnumberedsec',
-                                                                    'extra' => 
{
-                                                                      
'spaces_before_argument' => ' '
-                                                                    },
-                                                                    'level' => 
2
-                                                                  },
                                                                   'node' => {
                                                                     'cmdname' 
=> 'node',
                                                                     'extra' => 
{
@@ -4194,9 +4187,16 @@ $result_elements{'complex'} = [
                                                                       
'First-node' => 1
                                                                     }
                                                                   },
-                                                                  'section' => 
{}
+                                                                  'section' => 
{
+                                                                    'cmdname' 
=> 'unnumberedsec',
+                                                                    'extra' => 
{
+                                                                      
'spaces_before_argument' => ' '
+                                                                    },
+                                                                    'level' => 
2
+                                                                  },
+                                                                  
'unit_command' => {}
                                                                 },
-                                                                'type' => 
'element'
+                                                                'type' => 
'unit'
                                                               },
                                                               'FastBack' => {},
                                                               'FastForward' => 
{},
@@ -4209,17 +4209,17 @@ $result_elements{'complex'} = [
                                                               'This' => {},
                                                               'Up' => {}
                                                             },
-                                                            'element_command' 
=> {
+                                                            'node' => {},
+                                                            'section' => {
                                                               'cmdname' => 
'unnumberedsubsec',
                                                               'extra' => {
                                                                 
'spaces_before_argument' => ' '
                                                               },
                                                               'level' => 3
                                                             },
-                                                            'node' => {},
-                                                            'section' => {}
+                                                            'unit_command' => 
{}
                                                           },
-                                                          'type' => 'element'
+                                                          'type' => 'unit'
                                                         },
                                                         'FastBack' => {},
                                                         'FastForward' => {},
@@ -4234,17 +4234,17 @@ $result_elements{'complex'} = [
                                                         'This' => {},
                                                         'Up' => {}
                                                       },
-                                                      'element_command' => {
+                                                      'node' => {},
+                                                      'section' => {
                                                         'cmdname' => 
'subsection',
                                                         'extra' => {
                                                           
'spaces_before_argument' => ' '
                                                         },
                                                         'level' => 3
                                                       },
-                                                      'node' => {},
-                                                      'section' => {}
+                                                      'unit_command' => {}
                                                     },
-                                                    'type' => 'element'
+                                                    'type' => 'unit'
                                                   },
                                                   'FastBack' => {},
                                                   'FastForward' => {},
@@ -4259,17 +4259,17 @@ $result_elements{'complex'} = [
                                                   'This' => {},
                                                   'Up' => {}
                                                 },
-                                                'element_command' => {
+                                                'node' => {},
+                                                'section' => {
                                                   'cmdname' => 
'unnumberedsubsec',
                                                   'extra' => {
                                                     'spaces_before_argument' 
=> ' '
                                                   },
                                                   'level' => 3
                                                 },
-                                                'node' => {},
-                                                'section' => {}
+                                                'unit_command' => {}
                                               },
-                                              'type' => 'element'
+                                              'type' => 'unit'
                                             },
                                             'FastBack' => {},
                                             'FastForward' => {},
@@ -4282,17 +4282,17 @@ $result_elements{'complex'} = [
                                             'This' => {},
                                             'Up' => {}
                                           },
-                                          'element_command' => {
+                                          'node' => {},
+                                          'section' => {
                                             'cmdname' => 'subsection',
                                             'extra' => {
                                               'spaces_before_argument' => ' '
                                             },
                                             'level' => 3
                                           },
-                                          'node' => {},
-                                          'section' => {}
+                                          'unit_command' => {}
                                         },
-                                        'type' => 'element'
+                                        'type' => 'unit'
                                       },
                                       'FastBack' => {},
                                       'FastForward' => {},
@@ -4307,17 +4307,17 @@ $result_elements{'complex'} = [
                                       'This' => {},
                                       'Up' => {}
                                     },
-                                    'element_command' => {
+                                    'node' => {},
+                                    'section' => {
                                       'cmdname' => 'unnumberedsec',
                                       'extra' => {
                                         'spaces_before_argument' => ' '
                                       },
                                       'level' => 2
                                     },
-                                    'node' => {},
-                                    'section' => {}
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'FastBack' => {},
                                 'FastForward' => {},
@@ -4328,17 +4328,17 @@ $result_elements{'complex'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'node' => {},
+                              'section' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
                                 'level' => 3
                               },
-                              'node' => {},
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'FastBack' => {},
                           'FastForward' => {},
@@ -4350,7 +4350,8 @@ $result_elements{'complex'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'node' => {},
+                        'section' => {
                           'cmdname' => 'section',
                           'extra' => {
                             'spaces_before_argument' => '  '
@@ -4358,10 +4359,9 @@ $result_elements{'complex'} = [
                           'level' => 2,
                           'number' => '1.1'
                         },
-                        'node' => {},
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'FastBack' => {},
                     'FastForward' => {
@@ -4383,17 +4383,17 @@ $result_elements{'complex'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'node' => {},
+                              'section' => {
                                 'cmdname' => 'unnumbered',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
                                 'level' => 1
                               },
-                              'node' => {},
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'Forward' => {},
                           'Next' => {},
@@ -4406,17 +4406,17 @@ $result_elements{'complex'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'node' => {},
+                        'section' => {
                           'cmdname' => 'unnumbered',
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
                           'level' => 1
                         },
-                        'node' => {},
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'Forward' => {},
                     'Next' => {},
@@ -4427,7 +4427,8 @@ $result_elements{'complex'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
+                  'node' => {},
+                  'section' => {
                     'cmdname' => 'chapter',
                     'extra' => {
                       'spaces_before_argument' => ' '
@@ -4435,10 +4436,9 @@ $result_elements{'complex'} = [
                     'level' => 1,
                     'number' => 2
                   },
-                  'node' => {},
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
@@ -4449,7 +4449,8 @@ $result_elements{'complex'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'node' => {},
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
@@ -4457,10 +4458,9 @@ $result_elements{'complex'} = [
               'level' => 1,
               'number' => 1
             },
-            'node' => {},
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'NodeForward' => {},
@@ -4477,15 +4477,15 @@ $result_elements{'complex'} = [
         },
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {},
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -4537,7 +4537,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'F
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}
 [...]
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'ex
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'B
 [...]
@@ -4549,7 +4549,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'d
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}
 [...]
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'B
 [...]
@@ -4563,7 +4563,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'d
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}
 [...]
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'B
 [...]
@@ -4577,7 +4577,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'d
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}
 [...]
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
@@ -4589,7 +4589,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'d
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}
 [...]
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
@@ -4603,7 +4603,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'d
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
@@ -4613,7 +4613,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'d
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4624,7 +4624,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'d
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4639,7 +4639,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex'}[0];
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4651,7 +4651,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex'}[0];
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ext
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4661,7 +4661,7 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex'}[0];
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'n
 [...]
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'complex'}[0];
@@ -4671,13 +4671,13 @@ 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = $result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex'}[0];
 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'};
-$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'complex'}[0]{'extra'}{'directions'}{'Forward'} = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'complex'}[0]{'extra'}{'directions'}{'NodeForward'} = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'complex'}[0]{'extra'}{'directions'}{'NodeNext'} = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'complex'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'complex'}[0];
 $result_elements{'complex'}[0]{'extra'}{'node'} = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_n
 [...]
-$result_elements{'complex'}[0]{'extra'}{'section'} = 
$result_elements{'complex'}[0]{'extra'}{'element_command'};
+$result_elements{'complex'}[0]{'extra'}{'unit_command'} = 
$result_elements{'complex'}[0]{'extra'}{'section'};
 $result_elements{'complex'}[1] = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'complex'}[2] = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 $result_elements{'complex'}[3] = 
$result_elements{'complex'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index 90c4953..e93f811 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -520,11 +520,11 @@ $result_trees{'complex_split_at_node'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -905,13 +905,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1281,13 +1281,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1370,13 +1370,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1459,13 +1459,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1548,13 +1548,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1637,13 +1637,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1842,13 +1842,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -1937,13 +1937,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2027,13 +2027,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2131,12 +2131,12 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2299,13 +2299,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2405,13 +2405,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2571,13 +2571,13 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -2697,12 +2697,12 @@ $result_trees{'complex_split_at_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'complex_split_at_node'}[0];
@@ -2789,9 +2789,9 @@ 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'extra'}
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[0]{'contents'}[2];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'complex_split_at_node'}[0]{'contents'}[2];
 $result_trees{'complex_split_at_node'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'complex_split_at_node'}[0];
-$result_trees{'complex_split_at_node'}[0]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[0]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[0]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[2];
+$result_trees{'complex_split_at_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[1]{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'complex_split_at_node'}[1]{'contents'}[0];
@@ -2851,10 +2851,10 @@ 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'extra'}
 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'complex_split_at_node'}[1]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'complex_split_at_node'}[1]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[1];
-$result_trees{'complex_split_at_node'}[1]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[0];
-$result_trees{'complex_split_at_node'}[1]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[1]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[1]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[1]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[1]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[0];
 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[2]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2912,10 +2912,10 @@ 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'extra'}
 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'complex_split_at_node'}[2]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'complex_split_at_node'}[2]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[2];
-$result_trees{'complex_split_at_node'}[2]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[1];
-$result_trees{'complex_split_at_node'}[2]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[2]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[2]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[2]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[2]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[1];
 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[3]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2925,10 +2925,10 @@ 
$result_trees{'complex_split_at_node'}[3]{'contents'}[1]{'args'}[0]{'contents'}[
 $result_trees{'complex_split_at_node'}[3]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[3]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[3]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[3];
-$result_trees{'complex_split_at_node'}[3]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[2];
-$result_trees{'complex_split_at_node'}[3]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[3]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[3]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[3]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[3]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[2];
 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[4]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2938,10 +2938,10 @@ 
$result_trees{'complex_split_at_node'}[4]{'contents'}[1]{'args'}[0]{'contents'}[
 $result_trees{'complex_split_at_node'}[4]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[4]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[4]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[4];
-$result_trees{'complex_split_at_node'}[4]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[3];
-$result_trees{'complex_split_at_node'}[4]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[4]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[4]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[4]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[4]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[3];
 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[5]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2951,10 +2951,10 @@ 
$result_trees{'complex_split_at_node'}[5]{'contents'}[1]{'args'}[0]{'contents'}[
 $result_trees{'complex_split_at_node'}[5]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[5]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[5]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[5];
-$result_trees{'complex_split_at_node'}[5]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[4];
-$result_trees{'complex_split_at_node'}[5]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[5]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[5]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[5]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[5]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[4];
 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[6]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2964,10 +2964,10 @@ 
$result_trees{'complex_split_at_node'}[6]{'contents'}[1]{'args'}[0]{'contents'}[
 $result_trees{'complex_split_at_node'}[6]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[6]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[6]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[6];
-$result_trees{'complex_split_at_node'}[6]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[5];
-$result_trees{'complex_split_at_node'}[6]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[6]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[6]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[6]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[6]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[5];
 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[7]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2995,10 +2995,10 @@ 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'contents'}[1]{'extra'}
 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'complex_split_at_node'}[7]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'complex_split_at_node'}[7]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[7];
-$result_trees{'complex_split_at_node'}[7]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[6];
-$result_trees{'complex_split_at_node'}[7]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[7]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[7]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[7]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[7]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[6];
 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[8]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3009,10 +3009,10 @@ 
$result_trees{'complex_split_at_node'}[8]{'contents'}[1]{'args'}[0]{'parent'} =
 
$result_trees{'complex_split_at_node'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[8]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'complex_split_at_node'}[8]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[8];
-$result_trees{'complex_split_at_node'}[8]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[7];
-$result_trees{'complex_split_at_node'}[8]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[8]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[8]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[8]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[8]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[7];
 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[9]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3022,10 +3022,10 @@ 
$result_trees{'complex_split_at_node'}[9]{'contents'}[1]{'args'}[0]{'contents'}[
 $result_trees{'complex_split_at_node'}[9]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[9]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[9]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[9]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[9];
-$result_trees{'complex_split_at_node'}[9]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[8];
-$result_trees{'complex_split_at_node'}[9]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[9]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[9]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[9]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[9]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[8];
 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[10]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'complex_split_at_node'}[10]{'contents'}[0];
@@ -3040,9 +3040,9 @@ 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'extra'}{'node_content
 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'parent'} = 
$result_trees{'complex_split_at_node'}[10];
-$result_trees{'complex_split_at_node'}[10]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[9];
-$result_trees{'complex_split_at_node'}[10]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[10]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[10]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[10]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[9];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[11]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[1];
@@ -3066,10 +3066,10 @@ 
$result_trees{'complex_split_at_node'}[11]{'contents'}[1]{'contents'}[1]{'conten
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'complex_split_at_node'}[11]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'complex_split_at_node'}[11]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[11]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[11];
-$result_trees{'complex_split_at_node'}[11]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[10];
-$result_trees{'complex_split_at_node'}[11]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[11]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[11]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[11]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[11]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[10];
 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[12]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3082,10 +3082,10 @@ 
$result_trees{'complex_split_at_node'}[12]{'contents'}[1]{'contents'}[1]{'conten
 
$result_trees{'complex_split_at_node'}[12]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'complex_split_at_node'}[12]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[12]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'complex_split_at_node'}[12]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[12]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[12];
-$result_trees{'complex_split_at_node'}[12]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[11];
-$result_trees{'complex_split_at_node'}[12]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[12]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[12]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[12]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[12]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[11];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[13]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1];
@@ -3108,10 +3108,10 @@ 
$result_trees{'complex_split_at_node'}[13]{'contents'}[1]{'contents'}[1]{'conten
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'complex_split_at_node'}[13]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'complex_split_at_node'}[13]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[13]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[13];
-$result_trees{'complex_split_at_node'}[13]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[12];
-$result_trees{'complex_split_at_node'}[13]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[13]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[13]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[1];
+$result_trees{'complex_split_at_node'}[13]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[13]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[12];
 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[14]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'complex_split_at_node'}[14]{'contents'}[0];
@@ -3129,9 +3129,9 @@ 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'extra'}{'nodes_manual
 $result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'parent'} = 
$result_trees{'complex_split_at_node'}[14];
 $result_trees{'complex_split_at_node'}[14]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[14]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[14]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[14];
-$result_trees{'complex_split_at_node'}[14]{'element_prev'} = 
$result_trees{'complex_split_at_node'}[13];
-$result_trees{'complex_split_at_node'}[14]{'extra'}{'element_command'} = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[14]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[14]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0];
+$result_trees{'complex_split_at_node'}[14]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[13];
 
 $result_texis{'complex_split_at_node'} = '@node Top,First node,(dir)
 @top
@@ -4045,7 +4045,7 @@ $result_elements{'complex_split_at_node'} = [
                                                                           
'This' => {},
                                                                           'Up' 
=> {}
                                                                         },
-                                                                        
'element_command' => {
+                                                                        'node' 
=> {
                                                                           
'cmdname' => 'node',
                                                                           
'extra' => {
                                                                             
'normalized' => 'unnumbered',
@@ -4216,16 +4216,16 @@ $result_elements{'complex_split_at_node'} = [
                                                                             
'First-node' => 1
                                                                           }
                                                                         },
-                                                                        'node' 
=> {},
                                                                         
'section' => {
                                                                           
'cmdname' => 'unnumberedsec',
                                                                           
'extra' => {
                                                                             
'spaces_before_argument' => ' '
                                                                           },
                                                                           
'level' => 2
-                                                                        }
+                                                                        },
+                                                                        
'unit_command' => {}
                                                                       },
-                                                                      'type' 
=> 'element'
+                                                                      'type' 
=> 'unit'
                                                                     },
                                                                     'FastBack' 
=> {},
                                                                     
'FastForward' => {},
@@ -4238,7 +4238,6 @@ $result_elements{'complex_split_at_node'} = [
                                                                     'This' => 
{},
                                                                     'Up' => {}
                                                                   },
-                                                                  
'element_command' => {},
                                                                   'node' => {},
                                                                   'section' => 
{
                                                                     'cmdname' 
=> 'unnumberedsubsec',
@@ -4246,9 +4245,10 @@ $result_elements{'complex_split_at_node'} = [
                                                                       
'spaces_before_argument' => ' '
                                                                     },
                                                                     'level' => 
3
-                                                                  }
+                                                                  },
+                                                                  
'unit_command' => {}
                                                                 },
-                                                                'type' => 
'element'
+                                                                'type' => 
'unit'
                                                               },
                                                               'FastBack' => {},
                                                               'FastForward' => 
{},
@@ -4263,7 +4263,6 @@ $result_elements{'complex_split_at_node'} = [
                                                               'This' => {},
                                                               'Up' => {}
                                                             },
-                                                            'element_command' 
=> {},
                                                             'node' => {},
                                                             'section' => {
                                                               'cmdname' => 
'subsection',
@@ -4271,9 +4270,10 @@ $result_elements{'complex_split_at_node'} = [
                                                                 
'spaces_before_argument' => ' '
                                                               },
                                                               'level' => 3
-                                                            }
+                                                            },
+                                                            'unit_command' => 
{}
                                                           },
-                                                          'type' => 'element'
+                                                          'type' => 'unit'
                                                         },
                                                         'FastBack' => {},
                                                         'FastForward' => {},
@@ -4288,7 +4288,6 @@ $result_elements{'complex_split_at_node'} = [
                                                         'This' => {},
                                                         'Up' => {}
                                                       },
-                                                      'element_command' => {},
                                                       'node' => {},
                                                       'section' => {
                                                         'cmdname' => 
'unnumberedsubsec',
@@ -4296,9 +4295,10 @@ $result_elements{'complex_split_at_node'} = [
                                                           
'spaces_before_argument' => ' '
                                                         },
                                                         'level' => 3
-                                                      }
+                                                      },
+                                                      'unit_command' => {}
                                                     },
-                                                    'type' => 'element'
+                                                    'type' => 'unit'
                                                   },
                                                   'FastBack' => {},
                                                   'FastForward' => {},
@@ -4311,7 +4311,6 @@ $result_elements{'complex_split_at_node'} = [
                                                   'This' => {},
                                                   'Up' => {}
                                                 },
-                                                'element_command' => {},
                                                 'node' => {},
                                                 'section' => {
                                                   'cmdname' => 'subsection',
@@ -4319,9 +4318,10 @@ $result_elements{'complex_split_at_node'} = [
                                                     'spaces_before_argument' 
=> ' '
                                                   },
                                                   'level' => 3
-                                                }
+                                                },
+                                                'unit_command' => {}
                                               },
-                                              'type' => 'element'
+                                              'type' => 'unit'
                                             },
                                             'FastBack' => {},
                                             'FastForward' => {},
@@ -4336,7 +4336,6 @@ $result_elements{'complex_split_at_node'} = [
                                             'This' => {},
                                             'Up' => {}
                                           },
-                                          'element_command' => {},
                                           'node' => {},
                                           'section' => {
                                             'cmdname' => 'unnumberedsec',
@@ -4344,9 +4343,10 @@ $result_elements{'complex_split_at_node'} = [
                                               'spaces_before_argument' => ' '
                                             },
                                             'level' => 2
-                                          }
+                                          },
+                                          'unit_command' => {}
                                         },
-                                        'type' => 'element'
+                                        'type' => 'unit'
                                       },
                                       'FastBack' => {},
                                       'FastForward' => {},
@@ -4357,7 +4357,6 @@ $result_elements{'complex_split_at_node'} = [
                                       'This' => {},
                                       'Up' => {}
                                     },
-                                    'element_command' => {},
                                     'node' => {},
                                     'section' => {
                                       'cmdname' => 'subsection',
@@ -4365,9 +4364,10 @@ $result_elements{'complex_split_at_node'} = [
                                         'spaces_before_argument' => ' '
                                       },
                                       'level' => 3
-                                    }
+                                    },
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'FastBack' => {},
                                 'FastForward' => {},
@@ -4379,7 +4379,6 @@ $result_elements{'complex_split_at_node'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {},
                               'node' => {},
                               'section' => {
                                 'cmdname' => 'section',
@@ -4388,19 +4387,20 @@ $result_elements{'complex_split_at_node'} = [
                                 },
                                 'level' => 2,
                                 'number' => '1.1'
-                              }
+                              },
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'FastForward' => {},
                           'Forward' => {},
                           'NodeUp' => {},
                           'This' => {}
                         },
-                        'element_command' => {},
-                        'node' => {}
+                        'node' => {},
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'FastBack' => {},
                     'FastForward' => {
@@ -4422,10 +4422,10 @@ $result_elements{'complex_split_at_node'} = [
                                       'NodeUp' => {},
                                       'This' => {}
                                     },
-                                    'element_command' => {},
-                                    'node' => {}
+                                    'node' => {},
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'NodeBack' => {},
                                 'NodeForward' => {},
@@ -4436,7 +4436,6 @@ $result_elements{'complex_split_at_node'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {},
                               'node' => {},
                               'section' => {
                                 'cmdname' => 'unnumbered',
@@ -4444,9 +4443,10 @@ $result_elements{'complex_split_at_node'} = [
                                   'spaces_before_argument' => ' '
                                 },
                                 'level' => 1
-                              }
+                              },
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'Forward' => {},
                           'Next' => {},
@@ -4459,7 +4459,6 @@ $result_elements{'complex_split_at_node'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {},
                         'node' => {},
                         'section' => {
                           'cmdname' => 'unnumbered',
@@ -4467,9 +4466,10 @@ $result_elements{'complex_split_at_node'} = [
                             'spaces_before_argument' => ' '
                           },
                           'level' => 1
-                        }
+                        },
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'Forward' => {},
                     'Next' => {},
@@ -4480,7 +4480,6 @@ $result_elements{'complex_split_at_node'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {},
                   'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
@@ -4489,9 +4488,10 @@ $result_elements{'complex_split_at_node'} = [
                     },
                     'level' => 1,
                     'number' => 2
-                  }
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
@@ -4502,7 +4502,6 @@ $result_elements{'complex_split_at_node'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {},
             'node' => {},
             'section' => {
               'cmdname' => 'chapter',
@@ -4511,9 +4510,10 @@ $result_elements{'complex_split_at_node'} = [
               },
               'level' => 1,
               'number' => 1
-            }
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'NodeForward' => {},
@@ -4530,15 +4530,15 @@ $result_elements{'complex_split_at_node'} = [
         },
         'This' => {}
       },
-      'element_command' => {},
       'node' => {},
       'section' => {
         'cmdname' => 'top',
         'extra' => {},
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -4568,31 +4568,31 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'di [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'dire [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'direct [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
  [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_e [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_ele [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_elements{'comp [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'comple [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_child'}{'menu_up'}
 = $result_elements{'complex_split_at_no [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_elements{'comple [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_elements{'compl [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_child'}
 = $result_ele [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_prev'}
 = [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_up'}
 = $ [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_up'}
 = $result_elemen [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex_split_at_n [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_nod [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'Fast 
[...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_e [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_elements{'co [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_up'}
 = $result_elements{'comp [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex_split_a [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_child'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_ [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'ex [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_child'}{'menu_up'}
 = $result_elements{'complex_split_at_ [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex_split_at [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_child'}
 = $result_elements{'comp [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_next'}
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_next'}
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_next'}
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_next'}
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_next'}
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_next'}
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_prev'}
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_next'}{'menu_up'}
 = [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_prev'}
 = $result_el [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_next'}{'menu_up'}
 = $result_elem [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'}{'menu_up'}
 = $result_elements{'complex [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_prev'}
 = $result_elements{'complex_split_at_node'}[0]{'e [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'ext [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_up'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'directi [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = $result_elements{'complex_split_at_node'}[0]{'extra'}{'directions [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'ext
 [...]
@@ -4603,8 +4603,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'NodeUp'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extr
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'dir
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward
 [...]
@@ -4617,8 +4617,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'e
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back
 [...]
@@ -4631,8 +4631,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'e
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back
 [...]
@@ -4643,8 +4643,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'e
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
@@ -4657,8 +4657,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
@@ -4667,8 +4667,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'NodeUp'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
@@ -4678,14 +4678,14 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'complex_split_at_node'}[0];
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4696,8 +4696,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'complex_split_at_node'}[0];
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directi
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4706,8 +4706,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex_split_at_node'}[0];
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4718,8 +4718,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex_split_at_node'}[0];
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Bac
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -4728,8 +4728,8 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex_split_at_node'}[0];
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ex
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dire
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'ext
 [...]
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'complex_split_at_node'}[0];
@@ -4738,14 +4738,14 @@ 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'complex_split_at_node'}[0];
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'complex_split_at_node'}[0];
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'dir
 [...]
 $result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'Forward'} 
= 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'NodeNext'} 
= 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'complex_split_at_node'}[0];
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'element_command'} = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element
 [...]
-$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'} = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'}{
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'node'} = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'menu_next'
 [...]
+$result_elements{'complex_split_at_node'}[0]{'extra'}{'unit_command'} = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'node'}{'me
 [...]
 $result_elements{'complex_split_at_node'}[1] = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'complex_split_at_node'}[2] = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 $result_elements{'complex_split_at_node'}[3] = 
$result_elements{'complex_split_at_node'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index a97e8bb..df665ee 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -209,12 +209,12 @@ $result_trees{'double_part'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'first_in_page' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -267,13 +267,13 @@ $result_trees{'double_part'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'first_in_page' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -406,14 +406,14 @@ $result_trees{'double_part'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'first_in_page' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'double_part'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'double_part'}[0];
@@ -444,20 +444,20 @@ 
$result_trees{'double_part'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_comm
 $result_trees{'double_part'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'double_part'}[0]{'contents'}[2];
 $result_trees{'double_part'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'double_part'}[0]{'contents'}[2];
 $result_trees{'double_part'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'double_part'}[0];
-$result_trees{'double_part'}[0]{'extra'}{'element_command'} = 
$result_trees{'double_part'}[0]{'contents'}[2];
 $result_trees{'double_part'}[0]{'extra'}{'first_in_page'} = 
$result_trees{'double_part'}[0];
 $result_trees{'double_part'}[0]{'extra'}{'node'} = 
$result_trees{'double_part'}[0]{'contents'}[1];
 $result_trees{'double_part'}[0]{'extra'}{'section'} = 
$result_trees{'double_part'}[0]{'contents'}[2];
+$result_trees{'double_part'}[0]{'extra'}{'unit_command'} = 
$result_trees{'double_part'}[0]{'contents'}[2];
 
$result_trees{'double_part'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_part'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'double_part'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
 $result_trees{'double_part'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
 
$result_trees{'double_part'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'double_part'}[1]{'contents'}[0]{'contents'}[1];
 $result_trees{'double_part'}[1]{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
 $result_trees{'double_part'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'double_part'}[1];
-$result_trees{'double_part'}[1]{'element_prev'} = 
$result_trees{'double_part'}[0];
-$result_trees{'double_part'}[1]{'extra'}{'element_command'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
 $result_trees{'double_part'}[1]{'extra'}{'first_in_page'} = 
$result_trees{'double_part'}[1];
 $result_trees{'double_part'}[1]{'extra'}{'section'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
+$result_trees{'double_part'}[1]{'extra'}{'unit_command'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
+$result_trees{'double_part'}[1]{'unit_prev'} = $result_trees{'double_part'}[0];
 
$result_trees{'double_part'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_part'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'double_part'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'double_part'}[2]{'contents'}[0];
 
$result_trees{'double_part'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_part'}[2]{'contents'}[0]{'contents'}[0];
@@ -474,11 +474,11 @@ 
$result_trees{'double_part'}[2]{'contents'}[2]{'args'}[0]{'parent'} = $result_tr
 $result_trees{'double_part'}[2]{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'double_part'}[2]{'contents'}[2];
 $result_trees{'double_part'}[2]{'contents'}[2]{'extra'}{'associated_part'} = 
$result_trees{'double_part'}[2]{'contents'}[0];
 $result_trees{'double_part'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'double_part'}[2];
-$result_trees{'double_part'}[2]{'element_prev'} = 
$result_trees{'double_part'}[1];
-$result_trees{'double_part'}[2]{'extra'}{'element_command'} = 
$result_trees{'double_part'}[2]{'contents'}[2];
 $result_trees{'double_part'}[2]{'extra'}{'first_in_page'} = 
$result_trees{'double_part'}[2];
 $result_trees{'double_part'}[2]{'extra'}{'node'} = 
$result_trees{'double_part'}[2]{'contents'}[1];
 $result_trees{'double_part'}[2]{'extra'}{'section'} = 
$result_trees{'double_part'}[2]{'contents'}[2];
+$result_trees{'double_part'}[2]{'extra'}{'unit_command'} = 
$result_trees{'double_part'}[2]{'contents'}[2];
+$result_trees{'double_part'}[2]{'unit_prev'} = $result_trees{'double_part'}[1];
 
 $result_texis{'double_part'} = '@node Top
 @top top
@@ -717,17 +717,17 @@ $result_elements{'double_part'} = [
                     'Prev' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'first_in_page' => {},
+                  'section' => {
                     'cmdname' => 'part',
                     'extra' => {
                       'spaces_before_argument' => ' '
                     },
                     'level' => 0
                   },
-                  'first_in_page' => {},
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'FastBack' => {},
               'NodeBack' => {},
@@ -735,21 +735,6 @@ $result_elements{'double_part'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'associated_part' => {
-                  'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'level' => 0
-                },
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'first_in_page' => {},
             'node' => {
               'cmdname' => 'node',
@@ -769,9 +754,24 @@ $result_elements{'double_part'} = [
                 'Top' => 1
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'level' => 0
+                },
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -779,18 +779,18 @@ $result_elements{'double_part'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'first_in_page' => {},
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'first_in_page' => {},
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -802,7 +802,7 @@ 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = $result_elements{'double_part'}[0];
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'first_in_page'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
-$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'double_part'}[0];
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'double_part'}[0];
@@ -810,7 +810,7 @@ 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'first_in_page'}
 = $result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
-$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'double_part'}[0]{'extra'}{'directions'}{'Forward'} = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 $result_elements{'double_part'}[0]{'extra'}{'directions'}{'Next'} = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 $result_elements{'double_part'}[0]{'extra'}{'directions'}{'NodeForward'} = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -818,7 +818,7 @@ 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'NodeNext'} = $result_
 $result_elements{'double_part'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'double_part'}[0];
 $result_elements{'double_part'}[0]{'extra'}{'first_in_page'} = 
$result_elements{'double_part'}[0];
 $result_elements{'double_part'}[0]{'extra'}{'node'} = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
-$result_elements{'double_part'}[0]{'extra'}{'section'} = 
$result_elements{'double_part'}[0]{'extra'}{'element_command'};
+$result_elements{'double_part'}[0]{'extra'}{'unit_command'} = 
$result_elements{'double_part'}[0]{'extra'}{'section'};
 $result_elements{'double_part'}[1] = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 $result_elements{'double_part'}[2] = 
$result_elements{'double_part'}[0]{'extra'}{'directions'}{'FastForward'};
 
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 9166fc1..c8332ff 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -241,10 +241,10 @@ $result_trees{'explicit_node_directions'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -365,12 +365,12 @@ $result_trees{'explicit_node_directions'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -454,12 +454,12 @@ $result_trees{'explicit_node_directions'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'explicit_node_directions'}[0];
@@ -498,8 +498,8 @@ 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'contents'}[2]{'pare
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'explicit_node_directions'}[0];
-$result_trees{'explicit_node_directions'}[0]{'extra'}{'element_command'} = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1];
 $result_trees{'explicit_node_directions'}[0]{'extra'}{'node'} = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1];
+$result_trees{'explicit_node_directions'}[0]{'extra'}{'unit_command'} = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[1];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'explicit_node_directions'}[1]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[1];
@@ -518,9 +518,9 @@ 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manu
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'explicit_node_directions'}[1];
-$result_trees{'explicit_node_directions'}[1]{'element_prev'} = 
$result_trees{'explicit_node_directions'}[0];
-$result_trees{'explicit_node_directions'}[1]{'extra'}{'element_command'} = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[1]{'extra'}{'node'} = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[1]{'extra'}{'unit_command'} = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[1]{'unit_prev'} = 
$result_trees{'explicit_node_directions'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'explicit_node_directions'}[2]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'explicit_node_directions'}[2]{'contents'}[0];
@@ -533,9 +533,9 @@ 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'nodes_manu
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[3]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'explicit_node_directions'}[2];
-$result_trees{'explicit_node_directions'}[2]{'element_prev'} = 
$result_trees{'explicit_node_directions'}[1];
-$result_trees{'explicit_node_directions'}[2]{'extra'}{'element_command'} = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[2]{'extra'}{'node'} = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[2]{'extra'}{'unit_command'} = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0];
+$result_trees{'explicit_node_directions'}[2]{'unit_prev'} = 
$result_trees{'explicit_node_directions'}[1];
 
 $result_texis{'explicit_node_directions'} = '@node Top
 Top node
@@ -667,7 +667,7 @@ $result_elements{'explicit_node_directions'} = [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'node' => {
                     'cmdname' => 'node',
                     'extra' => {
                       'normalized' => 'third-node',
@@ -697,9 +697,9 @@ $result_elements{'explicit_node_directions'} = [
                       'Top' => 1
                     }
                   },
-                  'node' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'NodeBack' => {},
               'NodeForward' => {},
@@ -708,19 +708,19 @@ $result_elements{'explicit_node_directions'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {},
-            'node' => {}
+            'node' => {},
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -731,23 +731,23 @@ 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'explicit_node_directions'}[0];
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'explicit_node_directions'}[0];
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'explicit_node_directions'}[0];
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'explicit_node_directions'}[0];
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'This'} 
= $result_elements{'explicit_node_directions'}[0];
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'element_command'} = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
-$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'} = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'node'} = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'explicit_node_directions'}[0]{'extra'}{'unit_command'} = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
 $result_elements{'explicit_node_directions'}[1] = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'explicit_node_directions'}[2] = 
$result_elements{'explicit_node_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index ffb72fb..f383a8a 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -209,11 +209,11 @@ $result_trees{'internal_top_node_up'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -259,12 +259,12 @@ $result_trees{'internal_top_node_up'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'internal_top_node_up'}[0];
@@ -295,17 +295,17 @@ 
$result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'internal_top_node_up'}[0]{'contents'}[2];
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'internal_top_node_up'}[0]{'contents'}[2];
 $result_trees{'internal_top_node_up'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'internal_top_node_up'}[0];
-$result_trees{'internal_top_node_up'}[0]{'extra'}{'element_command'} = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1];
 $result_trees{'internal_top_node_up'}[0]{'extra'}{'node'} = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1];
 $result_trees{'internal_top_node_up'}[0]{'extra'}{'section'} = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[2];
+$result_trees{'internal_top_node_up'}[0]{'extra'}{'unit_command'} = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[1];
 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0];
 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'internal_top_node_up'}[1];
-$result_trees{'internal_top_node_up'}[1]{'element_prev'} = 
$result_trees{'internal_top_node_up'}[0];
-$result_trees{'internal_top_node_up'}[1]{'extra'}{'element_command'} = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0];
 $result_trees{'internal_top_node_up'}[1]{'extra'}{'node'} = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0];
+$result_trees{'internal_top_node_up'}[1]{'extra'}{'unit_command'} = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0];
+$result_trees{'internal_top_node_up'}[1]{'unit_prev'} = 
$result_trees{'internal_top_node_up'}[0];
 
 $result_texis{'internal_top_node_up'} = '@node Top
 @top internal top node up
@@ -430,7 +430,7 @@ $result_elements{'internal_top_node_up'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'first',
@@ -448,15 +448,14 @@ $result_elements{'internal_top_node_up'} = [
                 'Top' => 1
               }
             },
-            'node' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
       'node' => {},
       'section' => {
         'cmdname' => 'top',
@@ -464,9 +463,10 @@ $result_elements{'internal_top_node_up'} = [
           'spaces_before_argument' => ' '
         },
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -476,13 +476,13 @@ 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'e
 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'internal_top_node_up'}[0];
 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'internal_top_node_up'}[0];
 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeNext'} 
= $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'internal_top_node_up'}[0];
-$result_elements{'internal_top_node_up'}[0]{'extra'}{'element_command'} = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
-$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'} = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
+$result_elements{'internal_top_node_up'}[0]{'extra'}{'node'} = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
+$result_elements{'internal_top_node_up'}[0]{'extra'}{'unit_command'} = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
 $result_elements{'internal_top_node_up'}[1] = 
$result_elements{'internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
 
 
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 62898a0..18043a2 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -287,11 +287,11 @@ $result_trees{'lone_Top_node'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -331,9 +331,9 @@ $result_trees{'lone_Top_node'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'lone
 
$result_trees{'lone_Top_node'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[3]{'args'}[0];
 $result_trees{'lone_Top_node'}[0]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[3];
 $result_trees{'lone_Top_node'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'lone_Top_node'}[0];
-$result_trees{'lone_Top_node'}[0]{'extra'}{'element_command'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[3];
 $result_trees{'lone_Top_node'}[0]{'extra'}{'node'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[2];
 $result_trees{'lone_Top_node'}[0]{'extra'}{'section'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[3];
+$result_trees{'lone_Top_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'lone_Top_node'}[0]{'contents'}[3];
 
 $result_texis{'lone_Top_node'} = '@setfilename lone_Top_node.info
 
@@ -467,14 +467,6 @@ $result_elements{'lone_Top_node'} = [
         'NodeUp' => {},
         'This' => {}
       },
-      'element_command' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'level' => 1,
-        'number' => 1
-      },
       'node' => {
         'cmdname' => 'node',
         'extra' => {
@@ -493,16 +485,24 @@ $result_elements{'lone_Top_node'} = [
           'Top' => 1
         }
       },
-      'section' => {}
+      'section' => {
+        'cmdname' => 'chapter',
+        'extra' => {
+          'spaces_before_argument' => ' '
+        },
+        'level' => 1,
+        'number' => 1
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'lone_Top_node'}[0]{'extra'}{'directions'}{'NodePrev'} = 
$result_elements{'lone_Top_node'}[0];
 $result_elements{'lone_Top_node'}[0]{'extra'}{'directions'}{'NodeUp'} = 
$result_elements{'lone_Top_node'}[0];
 $result_elements{'lone_Top_node'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'lone_Top_node'}[0];
 $result_elements{'lone_Top_node'}[0]{'extra'}{'node'}{'menu_up'}{'menu_child'} 
= $result_elements{'lone_Top_node'}[0]{'extra'}{'node'};
-$result_elements{'lone_Top_node'}[0]{'extra'}{'section'} = 
$result_elements{'lone_Top_node'}[0]{'extra'}{'element_command'};
+$result_elements{'lone_Top_node'}[0]{'extra'}{'unit_command'} = 
$result_elements{'lone_Top_node'}[0]{'extra'}{'section'};
 
 
 
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 95ea798..f8286f1 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -266,11 +266,11 @@ $result_trees{'node_part_chapter_after_chapter'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -361,13 +361,13 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -506,13 +506,13 @@ $result_trees{'node_part_chapter_after_chapter'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node_part_chapter_after_chapter'}[0];
@@ -553,9 +553,9 @@ 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2];
 $result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'node_part_chapter_after_chapter'}[0];
-$result_trees{'node_part_chapter_after_chapter'}[0]{'extra'}{'element_command'}
 = $result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2];
 $result_trees{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[1];
 $result_trees{'node_part_chapter_after_chapter'}[0]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2];
+$result_trees{'node_part_chapter_after_chapter'}[0]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0];
@@ -566,10 +566,10 @@ 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1]{'args'}[0]{'c
 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
 $result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'node_part_chapter_after_chapter'}[1];
-$result_trees{'node_part_chapter_after_chapter'}[1]{'element_prev'} = 
$result_trees{'node_part_chapter_after_chapter'}[0];
-$result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'element_command'}
 = $result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
 $result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
+$result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
+$result_trees{'node_part_chapter_after_chapter'}[1]{'unit_prev'} = 
$result_trees{'node_part_chapter_after_chapter'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -586,10 +586,10 @@ 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2]{'contents'}[1
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[1];
 $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'node_part_chapter_after_chapter'}[2];
-$result_trees{'node_part_chapter_after_chapter'}[2]{'element_prev'} = 
$result_trees{'node_part_chapter_after_chapter'}[1];
-$result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'element_command'}
 = $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2];
 $result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0];
 $result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2];
+$result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2];
+$result_trees{'node_part_chapter_after_chapter'}[2]{'unit_prev'} = 
$result_trees{'node_part_chapter_after_chapter'}[1];
 
 $result_texis{'node_part_chapter_after_chapter'} = '@node Top
 @top top
@@ -859,21 +859,6 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {
-                    'cmdname' => 'chapter',
-                    'extra' => {
-                      'associated_part' => {
-                        'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'level' => 0
-                      },
-                      'spaces_before_argument' => ' '
-                    },
-                    'level' => 1,
-                    'number' => 2
-                  },
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -904,9 +889,24 @@ $result_elements{'node_part_chapter_after_chapter'} = [
                       'Top' => 1
                     }
                   },
-                  'section' => {}
+                  'section' => {
+                    'cmdname' => 'chapter',
+                    'extra' => {
+                      'associated_part' => {
+                        'cmdname' => 'part',
+                        'extra' => {
+                          'spaces_before_argument' => ' '
+                        },
+                        'level' => 0
+                      },
+                      'spaces_before_argument' => ' '
+                    },
+                    'level' => 1,
+                    'number' => 2
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'NodeBack' => {},
@@ -917,7 +917,8 @@ $result_elements{'node_part_chapter_after_chapter'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'node' => {},
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
@@ -925,10 +926,9 @@ $result_elements{'node_part_chapter_after_chapter'} = [
               'level' => 1,
               'number' => 1
             },
-            'node' => {},
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -936,17 +936,17 @@ $result_elements{'node_part_chapter_after_chapter'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -962,7 +962,7 @@ 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'F
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'node_part_chapter_after_chapter'}[0];
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -972,14 +972,14 @@ 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'F
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'node_part_chapter_after_chapter'}[0];
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'node_part_chapter_after_chapter'}[0];
 $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'node'} = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'section'} = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'element_command'};
+$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'unit_command'}
 = $result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'section'};
 $result_elements{'node_part_chapter_after_chapter'}[1] = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'node_part_chapter_after_chapter'}[2] = 
$result_elements{'node_part_chapter_after_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
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 3fa145c..161b061 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -209,11 +209,11 @@ $result_trees{'node_part_chapter_after_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -328,13 +328,13 @@ $result_trees{'node_part_chapter_after_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node_part_chapter_after_top'}[0];
@@ -365,9 +365,9 @@ 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'e
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2];
 $result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'node_part_chapter_after_top'}[0];
-$result_trees{'node_part_chapter_after_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2];
 $result_trees{'node_part_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[1];
 $result_trees{'node_part_chapter_after_top'}[0]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2];
+$result_trees{'node_part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -381,10 +381,10 @@ 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'conte
 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'node_part_chapter_after_top'}[1]{'contents'}[1];
 $result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'node_part_chapter_after_top'}[1];
-$result_trees{'node_part_chapter_after_top'}[1]{'element_prev'} = 
$result_trees{'node_part_chapter_after_top'}[0];
-$result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'element_command'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2];
 $result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2];
+$result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2];
+$result_trees{'node_part_chapter_after_top'}[1]{'unit_prev'} = 
$result_trees{'node_part_chapter_after_top'}[0];
 
 $result_texis{'node_part_chapter_after_top'} = '@node Top
 @top top
@@ -580,21 +580,6 @@ $result_elements{'node_part_chapter_after_top'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'associated_part' => {
-                  'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'level' => 0
-                },
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -613,9 +598,24 @@ $result_elements{'node_part_chapter_after_top'} = [
                 'Top' => 1
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'level' => 0
+                },
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -623,17 +623,17 @@ $result_elements{'node_part_chapter_after_top'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -644,14 +644,14 @@ 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastF
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'node_part_chapter_after_top'}[0];
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
-$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'node_part_chapter_after_top'}[0];
 $result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
-$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'section'} = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'element_command'};
+$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'section'};
 $result_elements{'node_part_chapter_after_top'}[1] = 
$result_elements{'node_part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index a344a51..1ed3a9e 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -179,10 +179,10 @@ $result_trees{'node_up_external_node'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -305,12 +305,12 @@ $result_trees{'node_up_external_node'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node_up_external_node'}[0];
@@ -338,8 +338,8 @@ 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'contents'}[2]{'parent'
 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'node_up_external_node'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'node_up_external_node'}[0];
-$result_trees{'node_up_external_node'}[0]{'extra'}{'element_command'} = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1];
 $result_trees{'node_up_external_node'}[0]{'extra'}{'node'} = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1];
+$result_trees{'node_up_external_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'node_up_external_node'}[0]{'contents'}[1];
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'node_up_external_node'}[1]{'contents'}[0];
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[1];
@@ -360,9 +360,9 @@ 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[2]{'contents'}[1];
 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'node_up_external_node'}[1];
-$result_trees{'node_up_external_node'}[1]{'element_prev'} = 
$result_trees{'node_up_external_node'}[0];
-$result_trees{'node_up_external_node'}[1]{'extra'}{'element_command'} = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0];
 $result_trees{'node_up_external_node'}[1]{'extra'}{'node'} = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0];
+$result_trees{'node_up_external_node'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0];
+$result_trees{'node_up_external_node'}[1]{'unit_prev'} = 
$result_trees{'node_up_external_node'}[0];
 
 $result_texis{'node_up_external_node'} = '@node Top
 
@@ -513,7 +513,7 @@ $result_elements{'node_up_external_node'} = [
               },
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'first',
@@ -531,18 +531,18 @@ $result_elements{'node_up_external_node'} = [
                 'Top' => 1
               }
             },
-            'node' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -550,13 +550,13 @@ 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'
 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'node_up_external_node'}[0];
 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}{'extra'}{'manual_content'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}{'extra'}{'manual_content'};
 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'NodeNext'} 
= 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'node_up_external_node'}[0];
-$result_elements{'node_up_external_node'}[0]{'extra'}{'element_command'} = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
-$result_elements{'node_up_external_node'}[0]{'extra'}{'node'} = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
+$result_elements{'node_up_external_node'}[0]{'extra'}{'node'} = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
+$result_elements{'node_up_external_node'}[0]{'extra'}{'unit_command'} = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
 $result_elements{'node_up_external_node'}[1] = 
$result_elements{'node_up_external_node'}[0]{'extra'}{'directions'}{'Forward'};
 
 
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 bc7c5c3..5f3d885 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
@@ -241,10 +241,10 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -365,12 +365,12 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -485,13 +485,13 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[0];
@@ -530,8 +530,8 @@ 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'content
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[1];
@@ -550,9 +550,9 @@ 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'extra'}
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'element_prev'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
@@ -568,10 +568,10 @@ 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'parent'
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'element_prev'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'extra'}{'section'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1];
 
 $result_texis{'nodes_after_top_before_chapter_nodes'} = '@node Top
 Top node
@@ -735,7 +735,7 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'node' => {
                     'cmdname' => 'node',
                     'extra' => {
                       'normalized' => 'third-node',
@@ -765,7 +765,6 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = [
                       'Top' => 1
                     }
                   },
-                  'node' => {},
                   'section' => {
                     'cmdname' => 'chapter',
                     'extra' => {
@@ -773,9 +772,10 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} = 
[
                     },
                     'level' => 1,
                     'number' => 1
-                  }
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'NodeBack' => {},
               'NodeForward' => {},
@@ -784,19 +784,19 @@ $result_elements{'nodes_after_top_before_chapter_nodes'} 
= [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {},
-            'node' => {}
+            'node' => {},
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -807,23 +807,23 @@ 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0];
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0];
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0];
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0];
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'nodes_after_top_before_chapter_nodes'}[0];
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
-$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'} = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'node'} = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
 $result_elements{'nodes_after_top_before_chapter_nodes'}[1] = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'nodes_after_top_before_chapter_nodes'}[2] = 
$result_elements{'nodes_after_top_before_chapter_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
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 22b0f83..55bdc37 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
@@ -467,11 +467,11 @@ $result_trees{'nodes_after_top_before_chapter_sections'} 
= [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_sections'}[0];
@@ -543,9 +543,9 @@ 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3]{'pare
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_sections'}[0];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4];
 $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[3];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'section'} 
= $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4];
+$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[4];
 
 $result_texis{'nodes_after_top_before_chapter_sections'} = '@node Top
 Top node
@@ -700,14 +700,6 @@ 
$result_elements{'nodes_after_top_before_chapter_sections'} = [
         'NodeUp' => {},
         'This' => {}
       },
-      'element_command' => {
-        'cmdname' => 'chapter',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'level' => 1,
-        'number' => 1
-      },
       'node' => {
         'cmdname' => 'node',
         'extra' => {
@@ -738,9 +730,17 @@ 
$result_elements{'nodes_after_top_before_chapter_sections'} = [
           'Top' => 1
         }
       },
-      'section' => {}
+      'section' => {
+        'cmdname' => 'chapter',
+        'extra' => {
+          'spaces_before_argument' => ' '
+        },
+        'level' => 1,
+        'number' => 1
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_after_top_before_chapter_sections'}[0];
@@ -749,7 +749,7 @@ 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'directi
 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'};
 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'section'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'element_command'};
+$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_chapter_sections'}[0]{'extra'}{'section'};
 
 
 
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 63b50be..8005a20 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
@@ -241,10 +241,10 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -365,12 +365,12 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -485,13 +485,13 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[0];
@@ -530,8 +530,8 @@ 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'content
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1];
 $result_trees{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1];
+$result_trees{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[1];
@@ -550,9 +550,9 @@ 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'extra'}
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1];
-$result_trees{'nodes_after_top_before_section_nodes'}[1]{'element_prev'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[1]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
 $result_trees{'nodes_after_top_before_section_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
@@ -568,10 +568,10 @@ 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'parent'
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2];
-$result_trees{'nodes_after_top_before_section_nodes'}[2]{'element_prev'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[1];
-$result_trees{'nodes_after_top_before_section_nodes'}[2]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
 $result_trees{'nodes_after_top_before_section_nodes'}[2]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
 $result_trees{'nodes_after_top_before_section_nodes'}[2]{'extra'}{'section'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1];
+$result_trees{'nodes_after_top_before_section_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[1];
 
 $result_texis{'nodes_after_top_before_section_nodes'} = '@node Top
 Top node
@@ -736,7 +736,7 @@ $result_elements{'nodes_after_top_before_section_nodes'} = [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'node' => {
                     'cmdname' => 'node',
                     'extra' => {
                       'normalized' => 'third-node',
@@ -766,7 +766,6 @@ $result_elements{'nodes_after_top_before_section_nodes'} = [
                       'Top' => 1
                     }
                   },
-                  'node' => {},
                   'section' => {
                     'cmdname' => 'subsection',
                     'extra' => {
@@ -774,9 +773,10 @@ $result_elements{'nodes_after_top_before_section_nodes'} = 
[
                     },
                     'level' => 3,
                     'number' => 1
-                  }
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'NodeBack' => {},
               'NodeForward' => {},
@@ -785,19 +785,19 @@ $result_elements{'nodes_after_top_before_section_nodes'} 
= [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {},
-            'node' => {}
+            'node' => {},
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -808,23 +808,23 @@ 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0];
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0];
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0];
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0];
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'nodes_after_top_before_section_nodes'}[0];
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
-$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'} = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'node'} = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
+$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
 $result_elements{'nodes_after_top_before_section_nodes'}[1] = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'nodes_after_top_before_section_nodes'}[2] = 
$result_elements{'nodes_after_top_before_section_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
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 8f88695..bf8be4c 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
@@ -467,11 +467,11 @@ $result_trees{'nodes_after_top_before_section_sections'} 
= [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_sections'}[0];
@@ -543,9 +543,9 @@ 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3]{'pare
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_after_top_before_section_sections'}[0];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'extra'}{'element_command'}
 = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4];
 $result_trees{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[3];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'extra'}{'section'} 
= $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4];
+$result_trees{'nodes_after_top_before_section_sections'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[4];
 
 $result_texis{'nodes_after_top_before_section_sections'} = '@node Top
 Top node
@@ -701,14 +701,6 @@ 
$result_elements{'nodes_after_top_before_section_sections'} = [
         'NodeUp' => {},
         'This' => {}
       },
-      'element_command' => {
-        'cmdname' => 'subsection',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'level' => 3,
-        'number' => 1
-      },
       'node' => {
         'cmdname' => 'node',
         'extra' => {
@@ -739,9 +731,17 @@ 
$result_elements{'nodes_after_top_before_section_sections'} = [
           'Top' => 1
         }
       },
-      'section' => {}
+      'section' => {
+        'cmdname' => 'subsection',
+        'extra' => {
+          'spaces_before_argument' => ' '
+        },
+        'level' => 3,
+        'number' => 1
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_after_top_before_section_sections'}[0];
@@ -750,7 +750,7 @@ 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'directi
 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'};
 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'section'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'element_command'};
+$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_after_top_before_section_sections'}[0]{'extra'}{'section'};
 
 
 
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 139f9c4..3c79016 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
@@ -225,10 +225,10 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -324,12 +324,12 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[0];
@@ -366,8 +366,8 @@ 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'extra'
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[0];
-$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'element_command'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1];
 $result_trees{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'} = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1];
+$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'unit_command'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[1];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0];
@@ -382,9 +382,9 @@ 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'extra'
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[1];
-$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'element_prev'} = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0];
-$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'extra'}{'element_command'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0];
 $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'extra'}{'node'} = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0];
+$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0];
+$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_prev'} = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0];
 
 $result_texis{'nodes_no_node_top_explicit_directions'} = '@node first,,,(dir)
 first node
@@ -489,7 +489,7 @@ $result_elements{'nodes_no_node_top_explicit_directions'} = 
[
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'second-node',
@@ -507,9 +507,9 @@ $result_elements{'nodes_no_node_top_explicit_directions'} = 
[
                 'first' => 1
               }
             },
-            'node' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeUp' => {
@@ -524,10 +524,10 @@ $result_elements{'nodes_no_node_top_explicit_directions'} 
= [
         },
         'This' => {}
       },
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -536,12 +536,12 @@ 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'direction
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'nodes_no_node_top_explicit_directions'}[0];
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'nodes_no_node_top_explicit_directions'}[0];
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'nodes_no_node_top_explicit_directions'}[0];
-$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
-$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'} 
= 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
+$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'node'} 
= 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
+$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
 $result_elements{'nodes_no_node_top_explicit_directions'}[1] = 
$result_elements{'nodes_no_node_top_explicit_directions'}[0]{'extra'}{'directions'}{'Forward'};
 
 
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index a269fdf..d7022b8 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -386,11 +386,11 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -542,12 +542,12 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_internal_top_node_up'}[0];
@@ -606,9 +606,9 @@ 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'contents'
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'non_automatic_internal_top_node_up'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'extra'}{'element_command'}
 = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
 $result_trees{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'} = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
 $result_trees{'non_automatic_internal_top_node_up'}[0]{'extra'}{'section'} = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[2];
+$result_trees{'non_automatic_internal_top_node_up'}[0]{'extra'}{'unit_command'}
 = $result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[1];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
@@ -631,9 +631,9 @@ 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[1]
 = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_internal_top_node_up'}[1];
-$result_trees{'non_automatic_internal_top_node_up'}[1]{'element_prev'} = 
$result_trees{'non_automatic_internal_top_node_up'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[1]{'extra'}{'element_command'}
 = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
 $result_trees{'non_automatic_internal_top_node_up'}[1]{'extra'}{'node'} = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[1]{'extra'}{'unit_command'}
 = $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_prev'} = 
$result_trees{'non_automatic_internal_top_node_up'}[0];
 
 $result_texis{'non_automatic_internal_top_node_up'} = '@node Top, first, 
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals, @acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals
 @top internal top node up
@@ -783,7 +783,7 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
               'NodePrev' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'first',
@@ -801,15 +801,14 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
                 'Top' => 1
               }
             },
-            'node' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
       'node' => {},
       'section' => {
         'cmdname' => 'top',
@@ -817,9 +816,10 @@ $result_elements{'non_automatic_internal_top_node_up'} = [
           'spaces_before_argument' => ' '
         },
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -828,13 +828,13 @@ 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0];
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0];
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'non_automatic_internal_top_node_up'}[0];
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
-$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'} = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
+$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'node'} = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
+$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
 $result_elements{'non_automatic_internal_top_node_up'}[1] = 
$result_elements{'non_automatic_internal_top_node_up'}[0]{'extra'}{'directions'}{'Forward'};
 
 
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index a0dabad..48fb30d 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -386,11 +386,11 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -542,12 +542,12 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[0];
@@ -606,9 +606,9 @@ 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'contents'}
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2];
 $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'element_command'}
 = $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'} = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'section'} = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[2];
+$result_trees{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'unit_command'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
@@ -631,9 +631,9 @@ 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'extra'}{'n
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[1]
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[1];
-$result_trees{'non_automatic_top_node_up_and_url'}[1]{'element_prev'} = 
$result_trees{'non_automatic_top_node_up_and_url'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[1]{'extra'}{'element_command'}
 = $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
 $result_trees{'non_automatic_top_node_up_and_url'}[1]{'extra'}{'node'} = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[1]{'extra'}{'unit_command'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_prev'} = 
$result_trees{'non_automatic_top_node_up_and_url'}[0];
 
 $result_texis{'non_automatic_top_node_up_and_url'} = '@node Top, first, 
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals, @acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals
 @top internal top node up
@@ -783,7 +783,7 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
               'NodePrev' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'first',
@@ -801,15 +801,14 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
                 'Top' => 1
               }
             },
-            'node' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
       'node' => {},
       'section' => {
         'cmdname' => 'top',
@@ -817,9 +816,10 @@ $result_elements{'non_automatic_top_node_up_and_url'} = [
           'spaces_before_argument' => ' '
         },
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -828,13 +828,13 @@ 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0];
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0];
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'non_automatic_top_node_up_and_url'}[0];
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
-$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'} = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
+$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'node'} = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
+$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
 $result_elements{'non_automatic_top_node_up_and_url'}[1] = 
$result_elements{'non_automatic_top_node_up_and_url'}[0]{'extra'}{'directions'}{'Forward'};
 
 
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index 2601b5e..44beaa1 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -278,11 +278,11 @@ $result_trees{'non_automatic_top_node_up_url'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -380,12 +380,12 @@ $result_trees{'non_automatic_top_node_up_url'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'non_automatic_top_node_up_url'}[0];
@@ -429,9 +429,9 @@ 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2];
 $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'non_automatic_top_node_up_url'}[0];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'extra'}{'element_command'} 
= $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'} = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_url'}[0]{'extra'}{'section'} = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[2];
+$result_trees{'non_automatic_top_node_up_url'}[0]{'extra'}{'unit_command'} = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
@@ -446,9 +446,9 @@ 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[2]{'contents'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]
 = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'non_automatic_top_node_up_url'}[1];
-$result_trees{'non_automatic_top_node_up_url'}[1]{'element_prev'} = 
$result_trees{'non_automatic_top_node_up_url'}[0];
-$result_trees{'non_automatic_top_node_up_url'}[1]{'extra'}{'element_command'} 
= $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
 $result_trees{'non_automatic_top_node_up_url'}[1]{'extra'}{'node'} = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_url'}[1]{'extra'}{'unit_command'} = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
+$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_prev'} = 
$result_trees{'non_automatic_top_node_up_url'}[0];
 
 $result_texis{'non_automatic_top_node_up_url'} = '@node Top, first, (dir), 
(dir)
 @top internal top node up
@@ -607,7 +607,7 @@ $result_elements{'non_automatic_top_node_up_url'} = [
               },
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'first',
@@ -625,9 +625,9 @@ $result_elements{'non_automatic_top_node_up_url'} = [
                 'Top' => 1
               }
             },
-            'node' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
@@ -653,7 +653,6 @@ $result_elements{'non_automatic_top_node_up_url'} = [
         },
         'This' => {}
       },
-      'element_command' => {},
       'node' => {},
       'section' => {
         'cmdname' => 'top',
@@ -661,9 +660,10 @@ $result_elements{'non_automatic_top_node_up_url'} = [
           'spaces_before_argument' => ' '
         },
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -672,13 +672,13 @@ 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'For
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'non_automatic_top_node_up_url'}[0];
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'non_automatic_top_node_up_url'}[0];
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'non_automatic_top_node_up_url'}[0];
-$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
-$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'} = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
+$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'node'} = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
+$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'unit_command'} 
= 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
 $result_elements{'non_automatic_top_node_up_url'}[1] = 
$result_elements{'non_automatic_top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
 
 
diff --git a/tp/t/results/sectioning/part_before_chapter.pl 
b/tp/t/results/sectioning/part_before_chapter.pl
index e3308bb..6ef9dca 100644
--- a/tp/t/results/sectioning/part_before_chapter.pl
+++ b/tp/t/results/sectioning/part_before_chapter.pl
@@ -84,10 +84,10 @@ $result_trees{'part_before_chapter'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_before_chapter'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_before_chapter'}[0];
@@ -99,8 +99,8 @@ 
$result_trees{'part_before_chapter'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]
 $result_trees{'part_before_chapter'}[0]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'part_before_chapter'}[0]{'contents'}[2];
 
$result_trees{'part_before_chapter'}[0]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_before_chapter'}[0]{'contents'}[1];
 $result_trees{'part_before_chapter'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_before_chapter'}[0];
-$result_trees{'part_before_chapter'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_before_chapter'}[0]{'contents'}[2];
 $result_trees{'part_before_chapter'}[0]{'extra'}{'section'} = 
$result_trees{'part_before_chapter'}[0]{'contents'}[2];
+$result_trees{'part_before_chapter'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_before_chapter'}[0]{'contents'}[2];
 
 $result_texis{'part_before_chapter'} = '@part part
 
@@ -158,7 +158,7 @@ $result_elements{'part_before_chapter'} = [
       'directions' => {
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'chapter',
         'extra' => {
           'associated_part' => {
@@ -173,13 +173,13 @@ $result_elements{'part_before_chapter'} = [
         'level' => 1,
         'number' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'part_before_chapter'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'part_before_chapter'}[0];
-$result_elements{'part_before_chapter'}[0]{'extra'}{'section'} = 
$result_elements{'part_before_chapter'}[0]{'extra'}{'element_command'};
+$result_elements{'part_before_chapter'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_before_chapter'}[0]{'extra'}{'section'};
 
 
 
diff --git a/tp/t/results/sectioning/part_before_section.pl 
b/tp/t/results/sectioning/part_before_section.pl
index 23f4222..045f573 100644
--- a/tp/t/results/sectioning/part_before_section.pl
+++ b/tp/t/results/sectioning/part_before_section.pl
@@ -84,10 +84,10 @@ $result_trees{'part_before_section'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_before_section'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_before_section'}[0];
@@ -99,8 +99,8 @@ 
$result_trees{'part_before_section'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]
 $result_trees{'part_before_section'}[0]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'part_before_section'}[0]{'contents'}[2];
 
$result_trees{'part_before_section'}[0]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_before_section'}[0]{'contents'}[1];
 $result_trees{'part_before_section'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_before_section'}[0];
-$result_trees{'part_before_section'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_before_section'}[0]{'contents'}[2];
 $result_trees{'part_before_section'}[0]{'extra'}{'section'} = 
$result_trees{'part_before_section'}[0]{'contents'}[2];
+$result_trees{'part_before_section'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_before_section'}[0]{'contents'}[2];
 
 $result_texis{'part_before_section'} = '@part part
 
@@ -168,7 +168,7 @@ $result_elements{'part_before_section'} = [
       'directions' => {
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'section',
         'extra' => {
           'associated_part' => {
@@ -183,13 +183,13 @@ $result_elements{'part_before_section'} = [
         'level' => 1,
         'number' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'part_before_section'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'part_before_section'}[0];
-$result_elements{'part_before_section'}[0]{'extra'}{'section'} = 
$result_elements{'part_before_section'}[0]{'extra'}{'element_command'};
+$result_elements{'part_before_section'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_before_section'}[0]{'extra'}{'section'};
 
 
 
diff --git a/tp/t/results/sectioning/part_before_top.pl 
b/tp/t/results/sectioning/part_before_top.pl
index 5f83cea..74eb0c5 100644
--- a/tp/t/results/sectioning/part_before_top.pl
+++ b/tp/t/results/sectioning/part_before_top.pl
@@ -83,10 +83,10 @@ $result_trees{'part_before_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_before_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_before_top'}[0];
@@ -98,8 +98,8 @@ 
$result_trees{'part_before_top'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'pa
 $result_trees{'part_before_top'}[0]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'part_before_top'}[0]{'contents'}[2];
 $result_trees{'part_before_top'}[0]{'contents'}[2]{'extra'}{'associated_part'} 
= $result_trees{'part_before_top'}[0]{'contents'}[1];
 $result_trees{'part_before_top'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_before_top'}[0];
-$result_trees{'part_before_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_before_top'}[0]{'contents'}[2];
 $result_trees{'part_before_top'}[0]{'extra'}{'section'} = 
$result_trees{'part_before_top'}[0]{'contents'}[2];
+$result_trees{'part_before_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_before_top'}[0]{'contents'}[2];
 
 $result_texis{'part_before_top'} = '@part part
 
@@ -166,7 +166,7 @@ $result_elements{'part_before_top'} = [
       'directions' => {
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'associated_part' => {
@@ -180,13 +180,13 @@ $result_elements{'part_before_top'} = [
         },
         'level' => 0
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'part_before_top'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'part_before_top'}[0];
-$result_elements{'part_before_top'}[0]{'extra'}{'section'} = 
$result_elements{'part_before_top'}[0]{'extra'}{'element_command'};
+$result_elements{'part_before_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_before_top'}[0]{'extra'}{'section'};
 
 
 
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index f392331..c9a3e17 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -209,11 +209,11 @@ $result_trees{'part_chapter_after_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -328,13 +328,13 @@ $result_trees{'part_chapter_after_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_chapter_after_top'}[0];
@@ -365,9 +365,9 @@ 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'extra'
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_chapter_after_top'}[0]{'contents'}[2];
 $result_trees{'part_chapter_after_top'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_chapter_after_top'}[0];
-$result_trees{'part_chapter_after_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2];
 $result_trees{'part_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[1];
 $result_trees{'part_chapter_after_top'}[0]{'extra'}{'section'} = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2];
+$result_trees{'part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'part_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'part_chapter_after_top'}[1]{'contents'}[0];
 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_chapter_after_top'}[1]{'contents'}[0];
@@ -381,10 +381,10 @@ 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}
 $result_trees{'part_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'part_chapter_after_top'}[1]{'contents'}[2];
 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_chapter_after_top'}[1]{'contents'}[0];
 $result_trees{'part_chapter_after_top'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'part_chapter_after_top'}[1];
-$result_trees{'part_chapter_after_top'}[1]{'element_prev'} = 
$result_trees{'part_chapter_after_top'}[0];
-$result_trees{'part_chapter_after_top'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2];
 $result_trees{'part_chapter_after_top'}[1]{'extra'}{'node'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[1];
 $result_trees{'part_chapter_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2];
+$result_trees{'part_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2];
+$result_trees{'part_chapter_after_top'}[1]{'unit_prev'} = 
$result_trees{'part_chapter_after_top'}[0];
 
 $result_texis{'part_chapter_after_top'} = '@node Top
 @top top
@@ -570,21 +570,6 @@ $result_elements{'part_chapter_after_top'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'associated_part' => {
-                  'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'level' => 0
-                },
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -603,9 +588,24 @@ $result_elements{'part_chapter_after_top'} = [
                 'Top' => 1
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'level' => 0
+                },
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -613,17 +613,17 @@ $result_elements{'part_chapter_after_top'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -634,14 +634,14 @@ 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForwar
 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'part_chapter_after_top'}[0];
 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
-$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'Forward'} 
= 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'} = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'part_chapter_after_top'}[0];
 $result_elements{'part_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
-$result_elements{'part_chapter_after_top'}[0]{'extra'}{'section'} = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'element_command'};
+$result_elements{'part_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'section'};
 $result_elements{'part_chapter_after_top'}[1] = 
$result_elements{'part_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index 84115a8..898890f 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -250,11 +250,11 @@ $result_trees{'part_node_after_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -289,12 +289,12 @@ $result_trees{'part_node_after_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_after_top'}[0];
@@ -330,15 +330,15 @@ 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $r
 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'part_node_after_top'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'part_node_after_top'}[0];
-$result_trees{'part_node_after_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_after_top'}[0]{'contents'}[2];
 $result_trees{'part_node_after_top'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_after_top'}[0]{'contents'}[1];
 $result_trees{'part_node_after_top'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_after_top'}[0]{'contents'}[2];
+$result_trees{'part_node_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_node_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_after_top'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'part_node_after_top'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'part_node_after_top'}[1]{'contents'}[0];
 $result_trees{'part_node_after_top'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_after_top'}[1];
-$result_trees{'part_node_after_top'}[1]{'element_prev'} = 
$result_trees{'part_node_after_top'}[0];
-$result_trees{'part_node_after_top'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_after_top'}[1]{'contents'}[0];
 $result_trees{'part_node_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_after_top'}[1]{'contents'}[0];
+$result_trees{'part_node_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_after_top'}[1]{'contents'}[0];
+$result_trees{'part_node_after_top'}[1]{'unit_prev'} = 
$result_trees{'part_node_after_top'}[0];
 
 $result_texis{'part_node_after_top'} = '@node Top
 @top top
@@ -494,16 +494,16 @@ $result_elements{'part_node_after_top'} = [
               'Prev' => {},
               'This' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'part',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'level' => 0
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -512,13 +512,6 @@ $result_elements{'part_node_after_top'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
-        'cmdname' => 'top',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'level' => 0
-      },
       'node' => {
         'cmdname' => 'node',
         'extra' => {
@@ -537,9 +530,16 @@ $result_elements{'part_node_after_top'} = [
           }
         }
       },
-      'section' => {}
+      'section' => {
+        'cmdname' => 'top',
+        'extra' => {
+          'spaces_before_argument' => ' '
+        },
+        'level' => 0
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -547,7 +547,7 @@ 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}
 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_after_top'}[0];
 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = $result_elements{'part_node_after_top'}[0];
 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'Forward'} = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'Next'} = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeBack'} 
= $result_elements{'part_node_after_top'}[0];
@@ -555,7 +555,7 @@ 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeForward'}
 $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'NodeNext'} 
= $result_elements{'part_node_after_top'}[0];
 $result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'part_node_after_top'}[0];
 
$result_elements{'part_node_after_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_after_top'}[0]{'extra'}{'node'};
-$result_elements{'part_node_after_top'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'section'};
 $result_elements{'part_node_after_top'}[1] = 
$result_elements{'part_node_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 36ada11..d7d20d4 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -323,11 +323,11 @@ $result_trees{'part_node_before_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_before_top'}[0];
@@ -374,9 +374,9 @@ 
$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{
 
$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_before_top'}[0]{'contents'}[4];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[4]{'extra'}{'associated_part'}
 = $result_trees{'part_node_before_top'}[0]{'contents'}[2];
 $result_trees{'part_node_before_top'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'part_node_before_top'}[0];
-$result_trees{'part_node_before_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_before_top'}[0]{'contents'}[4];
 $result_trees{'part_node_before_top'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_before_top'}[0]{'contents'}[3];
 $result_trees{'part_node_before_top'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_before_top'}[0]{'contents'}[4];
+$result_trees{'part_node_before_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_before_top'}[0]{'contents'}[4];
 
 $result_texis{'part_node_before_top'} = '@node part node before top, Top,,Top
 @part part
@@ -542,20 +542,6 @@ $result_elements{'part_node_before_top'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
-        'cmdname' => 'top',
-        'extra' => {
-          'associated_part' => {
-            'cmdname' => 'part',
-            'extra' => {
-              'spaces_before_argument' => ' '
-            },
-            'level' => 0
-          },
-          'spaces_before_argument' => ' '
-        },
-        'level' => 0
-      },
       'node' => {
         'cmdname' => 'node',
         'extra' => {
@@ -574,9 +560,23 @@ $result_elements{'part_node_before_top'} = [
           }
         }
       },
-      'section' => {}
+      'section' => {
+        'cmdname' => 'top',
+        'extra' => {
+          'associated_part' => {
+            'cmdname' => 'part',
+            'extra' => {
+              'spaces_before_argument' => ' '
+            },
+            'level' => 0
+          },
+          'spaces_before_argument' => ' '
+        },
+        'level' => 0
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeBack'} 
= $result_elements{'part_node_before_top'}[0];
@@ -584,7 +584,7 @@ 
$result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeForward'
 $result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'NodeNext'} 
= $result_elements{'part_node_before_top'}[0];
 $result_elements{'part_node_before_top'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'part_node_before_top'}[0];
 
$result_elements{'part_node_before_top'}[0]{'extra'}{'node'}{'menu_child'}{'menu_up'}
 = $result_elements{'part_node_before_top'}[0]{'extra'}{'node'};
-$result_elements{'part_node_before_top'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_before_top'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_before_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_before_top'}[0]{'extra'}{'section'};
 
 
 
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 29cca4d..44a7c62 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -266,11 +266,11 @@ $result_trees{'part_node_chapter_after_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -541,13 +541,13 @@ $result_trees{'part_node_chapter_after_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[0];
@@ -588,9 +588,9 @@ 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'e
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
 $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
 $result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[1];
 $result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
+$result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0];
@@ -628,10 +628,10 @@ 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'conte
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'extra'}{'associated_part'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[1];
-$result_trees{'part_node_chapter_after_top'}[1]{'element_prev'} = 
$result_trees{'part_node_chapter_after_top'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
 $result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2];
 $result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
+$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
+$result_trees{'part_node_chapter_after_top'}[1]{'unit_prev'} = 
$result_trees{'part_node_chapter_after_top'}[0];
 
 $result_texis{'part_node_chapter_after_top'} = '@node Top
 @top top
@@ -850,21 +850,6 @@ $result_elements{'part_node_chapter_after_top'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'associated_part' => {
-                  'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'level' => 0
-                },
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -895,9 +880,24 @@ $result_elements{'part_node_chapter_after_top'} = [
                 'Top' => 1
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'level' => 0
+                },
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -905,17 +905,17 @@ $result_elements{'part_node_chapter_after_top'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -929,14 +929,14 @@ 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastF
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'part_node_chapter_after_top'}[0];
 $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'section'};
 $result_elements{'part_node_chapter_after_top'}[1] = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index f98321b..af6f730 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -209,11 +209,11 @@ $result_trees{'part_node_chapter_appendix'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -335,13 +335,13 @@ $result_trees{'part_node_chapter_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -377,12 +377,12 @@ $result_trees{'part_node_chapter_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_appendix'}[0];
@@ -413,9 +413,9 @@ 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'contents'}[1]{'ex
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_chapter_appendix'}[0];
-$result_trees{'part_node_chapter_appendix'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_chapter_appendix'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[1];
 $result_trees{'part_node_chapter_appendix'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2];
+$result_trees{'part_node_chapter_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0];
 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0];
@@ -430,16 +430,16 @@ 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2]{'args'}[0]{'parent
 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2];
 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_chapter_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_chapter_appendix'}[1];
-$result_trees{'part_node_chapter_appendix'}[1]{'element_prev'} = 
$result_trees{'part_node_chapter_appendix'}[0];
-$result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_chapter_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_chapter_appendix'}[0];
 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_appendix'}[2];
-$result_trees{'part_node_chapter_appendix'}[2]{'element_prev'} = 
$result_trees{'part_node_chapter_appendix'}[1];
-$result_trees{'part_node_chapter_appendix'}[2]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0];
+$result_trees{'part_node_chapter_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0];
+$result_trees{'part_node_chapter_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_chapter_appendix'}[1];
 
 $result_texis{'part_node_chapter_appendix'} = '@node Top
 @top top
@@ -649,7 +649,7 @@ $result_elements{'part_node_chapter_appendix'} = [
                     'Prev' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'appendix',
                     'extra' => {
                       'spaces_before_argument' => ' '
@@ -657,9 +657,9 @@ $result_elements{'part_node_chapter_appendix'} = [
                     'level' => 1,
                     'number' => 'A'
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'NodeBack' => {},
@@ -667,21 +667,6 @@ $result_elements{'part_node_chapter_appendix'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'associated_part' => {
-                  'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'level' => 0
-                },
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -700,9 +685,24 @@ $result_elements{'part_node_chapter_appendix'} = [
                 'Top' => 1
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'level' => 0
+                },
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -710,17 +710,17 @@ $result_elements{'part_node_chapter_appendix'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -731,21 +731,21 @@ 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastFo
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_chapter_appendix'}[0];
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'part_node_chapter_appendix'}[0];
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'part_node_chapter_appendix'}[0];
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
-$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'part_node_chapter_appendix'}[0];
 $result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'node'} = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
-$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'section'};
 $result_elements{'part_node_chapter_appendix'}[1] = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_chapter_appendix'}[2] = 
$result_elements{'part_node_chapter_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
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 e9d02ce..78f9e8d 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -266,11 +266,11 @@ $result_trees{'part_node_chapter_node_appendix'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -392,13 +392,13 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -475,13 +475,13 @@ $result_trees{'part_node_chapter_node_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_node_appendix'}[0];
@@ -522,9 +522,9 @@ 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_chapter_node_appendix'}[0];
-$result_trees{'part_node_chapter_node_appendix'}[0]{'extra'}{'element_command'}
 = $result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[1];
 $result_trees{'part_node_chapter_node_appendix'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2];
+$result_trees{'part_node_chapter_node_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0];
@@ -539,10 +539,10 @@ 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2]{'args'}[0]{'p
 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_chapter_node_appendix'}[1];
-$result_trees{'part_node_chapter_node_appendix'}[1]{'element_prev'} = 
$result_trees{'part_node_chapter_node_appendix'}[0];
-$result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'element_command'}
 = $result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_chapter_node_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_chapter_node_appendix'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -551,10 +551,10 @@ 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'parent'} = $
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'part_node_chapter_node_appendix'}[2];
-$result_trees{'part_node_chapter_node_appendix'}[2]{'element_prev'} = 
$result_trees{'part_node_chapter_node_appendix'}[1];
-$result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'element_command'}
 = $result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1];
+$result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1];
+$result_trees{'part_node_chapter_node_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_chapter_node_appendix'}[1];
 
 $result_texis{'part_node_chapter_node_appendix'} = '@node Top
 @top top
@@ -810,14 +810,6 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                     'Prev' => {},
                     'This' => {}
                   },
-                  'element_command' => {
-                    'cmdname' => 'appendix',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'level' => 1,
-                    'number' => 'A'
-                  },
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -848,9 +840,17 @@ $result_elements{'part_node_chapter_node_appendix'} = [
                       'Top' => 1
                     }
                   },
-                  'section' => {}
+                  'section' => {
+                    'cmdname' => 'appendix',
+                    'extra' => {
+                      'spaces_before_argument' => ' '
+                    },
+                    'level' => 1,
+                    'number' => 'A'
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'NodeBack' => {},
@@ -860,7 +860,8 @@ $result_elements{'part_node_chapter_node_appendix'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {},
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'associated_part' => {
@@ -875,10 +876,9 @@ $result_elements{'part_node_chapter_node_appendix'} = [
               'level' => 1,
               'number' => 1
             },
-            'node' => {},
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -886,17 +886,17 @@ $result_elements{'part_node_chapter_node_appendix'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -913,7 +913,7 @@ 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'F
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_chapter_node_appendix'}[0];
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -922,14 +922,14 @@ 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'F
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'part_node_chapter_node_appendix'}[0];
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
-$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'part_node_chapter_node_appendix'}[0];
 $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'node'} = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'unit_command'}
 = $result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'section'};
 $result_elements{'part_node_chapter_node_appendix'}[1] = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_chapter_node_appendix'}[2] = 
$result_elements{'part_node_chapter_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
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 d62373d..c8eb791 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -266,11 +266,11 @@ $result_trees{'part_node_node_part_appendix'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -392,13 +392,13 @@ $result_trees{'part_node_node_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -513,13 +513,13 @@ $result_trees{'part_node_node_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_node_part_appendix'}[0];
@@ -560,9 +560,9 @@ 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_node_part_appendix'}[0];
-$result_trees{'part_node_node_part_appendix'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_node_part_appendix'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[1];
 $result_trees{'part_node_node_part_appendix'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2];
+$result_trees{'part_node_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0];
 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0];
@@ -577,10 +577,10 @@ 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2]{'args'}[0]{'pare
 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_node_part_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_node_part_appendix'}[1];
-$result_trees{'part_node_node_part_appendix'}[1]{'element_prev'} = 
$result_trees{'part_node_node_part_appendix'}[0];
-$result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_node_part_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_node_part_appendix'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -594,10 +594,10 @@ 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2]{'args'}[0]{'cont
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_node_part_appendix'}[2];
-$result_trees{'part_node_node_part_appendix'}[2]{'element_prev'} = 
$result_trees{'part_node_node_part_appendix'}[1];
-$result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'element_command'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2];
 $result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'node'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2];
+$result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2];
+$result_trees{'part_node_node_part_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_node_part_appendix'}[1];
 
 $result_texis{'part_node_node_part_appendix'} = '@node Top
 @top top
@@ -889,21 +889,6 @@ $result_elements{'part_node_node_part_appendix'} = [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {
-                    'cmdname' => 'appendix',
-                    'extra' => {
-                      'associated_part' => {
-                        'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'level' => 0
-                      },
-                      'spaces_before_argument' => ' '
-                    },
-                    'level' => 1,
-                    'number' => 'A'
-                  },
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -934,9 +919,24 @@ $result_elements{'part_node_node_part_appendix'} = [
                       'Top' => 1
                     }
                   },
-                  'section' => {}
+                  'section' => {
+                    'cmdname' => 'appendix',
+                    'extra' => {
+                      'associated_part' => {
+                        'cmdname' => 'part',
+                        'extra' => {
+                          'spaces_before_argument' => ' '
+                        },
+                        'level' => 0
+                      },
+                      'spaces_before_argument' => ' '
+                    },
+                    'level' => 1,
+                    'number' => 'A'
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'NodeBack' => {},
@@ -946,7 +946,8 @@ $result_elements{'part_node_node_part_appendix'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {},
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'associated_part' => {
@@ -961,10 +962,9 @@ $result_elements{'part_node_node_part_appendix'} = [
               'level' => 1,
               'number' => 1
             },
-            'node' => {},
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -972,17 +972,17 @@ $result_elements{'part_node_node_part_appendix'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -998,7 +998,7 @@ 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'Fast
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_node_part_appendix'}[0];
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -1007,14 +1007,14 @@ 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'Fast
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'part_node_node_part_appendix'}[0];
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
-$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'part_node_node_part_appendix'}[0];
 $result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'node'} = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'section'};
 $result_elements{'part_node_node_part_appendix'}[1] = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_node_part_appendix'}[2] = 
$result_elements{'part_node_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 45707f9..27aa2b4 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -209,11 +209,11 @@ $result_trees{'part_node_part_appendix'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -335,13 +335,13 @@ $result_trees{'part_node_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -415,12 +415,12 @@ $result_trees{'part_node_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_part_appendix'}[0];
@@ -451,9 +451,9 @@ 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'extra
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_part_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_part_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_part_appendix'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_part_appendix'}[0];
-$result_trees{'part_node_part_appendix'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_part_appendix'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[1];
 $result_trees{'part_node_part_appendix'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2];
+$result_trees{'part_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_appendix'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'part_node_part_appendix'}[1]{'contents'}[0];
 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_appendix'}[1]{'contents'}[0];
@@ -468,10 +468,10 @@ 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_appendix'}[1]{'contents'}[2];
 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_part_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_part_appendix'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_part_appendix'}[1];
-$result_trees{'part_node_part_appendix'}[1]{'element_prev'} = 
$result_trees{'part_node_part_appendix'}[0];
-$result_trees{'part_node_part_appendix'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_part_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_part_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_part_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_part_appendix'}[0];
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'part_node_part_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_appendix'}[2]{'contents'}[0];
@@ -480,9 +480,9 @@ 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1]{'args'}[0]{'contents'
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'part_node_part_appendix'}[2]{'contents'}[1];
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1]{'extra'}{'associated_part'}
 = $result_trees{'part_node_part_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_part_appendix'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'part_node_part_appendix'}[2];
-$result_trees{'part_node_part_appendix'}[2]{'element_prev'} = 
$result_trees{'part_node_part_appendix'}[1];
-$result_trees{'part_node_part_appendix'}[2]{'extra'}{'element_command'} = 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_part_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1];
+$result_trees{'part_node_part_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1];
+$result_trees{'part_node_part_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_part_appendix'}[1];
 
 $result_texis{'part_node_part_appendix'} = '@node Top
 @top top
@@ -711,7 +711,7 @@ $result_elements{'part_node_part_appendix'} = [
                     'FastBack' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'appendix',
                     'extra' => {
                       'associated_part' => {
@@ -726,9 +726,9 @@ $result_elements{'part_node_part_appendix'} = [
                     'level' => 1,
                     'number' => 'A'
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'NodeBack' => {},
@@ -736,21 +736,6 @@ $result_elements{'part_node_part_appendix'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'associated_part' => {
-                  'cmdname' => 'part',
-                  'extra' => {
-                    'spaces_before_argument' => ' '
-                  },
-                  'level' => 0
-                },
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -769,9 +754,24 @@ $result_elements{'part_node_part_appendix'} = [
                 'Top' => 1
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'associated_part' => {
+                  'cmdname' => 'part',
+                  'extra' => {
+                    'spaces_before_argument' => ' '
+                  },
+                  'level' => 0
+                },
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -779,17 +779,17 @@ $result_elements{'part_node_part_appendix'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -799,21 +799,21 @@ 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForwa
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_part_appendix'}[0];
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'part_node_part_appendix'}[0];
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'part_node_part_appendix'}[0];
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
-$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'Next'} 
= 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'This'} 
= $result_elements{'part_node_part_appendix'}[0];
 $result_elements{'part_node_part_appendix'}[0]{'extra'}{'node'} = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'};
-$result_elements{'part_node_part_appendix'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'section'};
 $result_elements{'part_node_part_appendix'}[1] = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_part_appendix'}[2] = 
$result_elements{'part_node_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
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 56ac2b9..d94690e 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -266,11 +266,11 @@ $result_trees{'part_node_part_node_appendix'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -392,13 +392,13 @@ $result_trees{'part_node_part_node_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -513,13 +513,13 @@ $result_trees{'part_node_part_node_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_part_node_appendix'}[0];
@@ -560,9 +560,9 @@ 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_part_node_appendix'}[0];
-$result_trees{'part_node_part_node_appendix'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2];
 $result_trees{'part_node_part_node_appendix'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[1];
 $result_trees{'part_node_part_node_appendix'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2];
+$result_trees{'part_node_part_node_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0];
 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0];
@@ -577,10 +577,10 @@ 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2]{'args'}[0]{'pare
 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_part_node_appendix'}[1]{'contents'}[0];
 $result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_part_node_appendix'}[1];
-$result_trees{'part_node_part_node_appendix'}[1]{'element_prev'} = 
$result_trees{'part_node_part_node_appendix'}[0];
-$result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2];
+$result_trees{'part_node_part_node_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_part_node_appendix'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0];
@@ -594,10 +594,10 @@ 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2]{'args'}[0]{'cont
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2]{'extra'}{'associated_part'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_part_node_appendix'}[2];
-$result_trees{'part_node_part_node_appendix'}[2]{'element_prev'} = 
$result_trees{'part_node_part_node_appendix'}[1];
-$result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'element_command'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2];
 $result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'node'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2];
+$result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2];
+$result_trees{'part_node_part_node_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_part_node_appendix'}[1];
 
 $result_texis{'part_node_part_node_appendix'} = '@node Top
 @top top
@@ -879,21 +879,6 @@ $result_elements{'part_node_part_node_appendix'} = [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {
-                    'cmdname' => 'appendix',
-                    'extra' => {
-                      'associated_part' => {
-                        'cmdname' => 'part',
-                        'extra' => {
-                          'spaces_before_argument' => ' '
-                        },
-                        'level' => 0
-                      },
-                      'spaces_before_argument' => ' '
-                    },
-                    'level' => 1,
-                    'number' => 'A'
-                  },
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -924,9 +909,24 @@ $result_elements{'part_node_part_node_appendix'} = [
                       'Top' => 1
                     }
                   },
-                  'section' => {}
+                  'section' => {
+                    'cmdname' => 'appendix',
+                    'extra' => {
+                      'associated_part' => {
+                        'cmdname' => 'part',
+                        'extra' => {
+                          'spaces_before_argument' => ' '
+                        },
+                        'level' => 0
+                      },
+                      'spaces_before_argument' => ' '
+                    },
+                    'level' => 1,
+                    'number' => 'A'
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'NodeBack' => {},
@@ -936,7 +936,8 @@ $result_elements{'part_node_part_node_appendix'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {},
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'associated_part' => {
@@ -951,10 +952,9 @@ $result_elements{'part_node_part_node_appendix'} = [
               'level' => 1,
               'number' => 1
             },
-            'node' => {},
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -962,17 +962,17 @@ $result_elements{'part_node_part_node_appendix'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -988,7 +988,7 @@ 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'Fast
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_part_node_appendix'}[0];
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -997,14 +997,14 @@ 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'Fast
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'part_node_part_node_appendix'}[0];
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
-$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'part_node_part_node_appendix'}[0];
 $result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'node'} = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
-$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'section'} = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'element_command'};
+$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'section'};
 $result_elements{'part_node_part_node_appendix'}[1] = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'part_node_part_node_appendix'}[2] = 
$result_elements{'part_node_part_node_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
diff --git a/tp/t/results/sectioning/sectioning_part_appendix.pl 
b/tp/t/results/sectioning/sectioning_part_appendix.pl
index 5b6b944..365f4d9 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix.pl
@@ -52,10 +52,10 @@ $result_trees{'sectioning_part_appendix'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -98,12 +98,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -146,12 +146,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -194,12 +194,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -242,12 +242,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -328,12 +328,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -376,12 +376,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -423,12 +423,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -471,12 +471,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -512,12 +512,12 @@ $result_trees{'sectioning_part_appendix'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'sectioning_part_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[0];
@@ -525,36 +525,36 @@ 
$result_trees{'sectioning_part_appendix'}[0]{'contents'}[1]{'args'}[0]{'contents
 
$result_trees{'sectioning_part_appendix'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[0]{'contents'}[1];
 
$result_trees{'sectioning_part_appendix'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[0]{'contents'}[1];
 $result_trees{'sectioning_part_appendix'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[0];
-$result_trees{'sectioning_part_appendix'}[0]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[0]{'contents'}[1];
 $result_trees{'sectioning_part_appendix'}[0]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[0]{'contents'}[1];
+$result_trees{'sectioning_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[0]{'contents'}[1];
 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[1]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[1]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[1];
-$result_trees{'sectioning_part_appendix'}[1]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[0];
-$result_trees{'sectioning_part_appendix'}[1]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[1]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[0];
 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[2];
-$result_trees{'sectioning_part_appendix'}[2]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[1];
-$result_trees{'sectioning_part_appendix'}[2]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[2]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[1];
 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[3];
-$result_trees{'sectioning_part_appendix'}[3]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[2];
-$result_trees{'sectioning_part_appendix'}[3]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[3]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[3]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[3]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[2];
 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[4];
-$result_trees{'sectioning_part_appendix'}[4]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[3];
-$result_trees{'sectioning_part_appendix'}[4]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[4]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[4]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[4]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[3];
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[0];
@@ -564,36 +564,36 @@ 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[1];
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1]{'extra'}{'associated_part'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[5];
-$result_trees{'sectioning_part_appendix'}[5]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[4];
-$result_trees{'sectioning_part_appendix'}[5]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1];
 $result_trees{'sectioning_part_appendix'}[5]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1];
+$result_trees{'sectioning_part_appendix'}[5]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1];
+$result_trees{'sectioning_part_appendix'}[5]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[4];
 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[6];
-$result_trees{'sectioning_part_appendix'}[6]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[5];
-$result_trees{'sectioning_part_appendix'}[6]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[6]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[6]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[6]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[5];
 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[7];
-$result_trees{'sectioning_part_appendix'}[7]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[6];
-$result_trees{'sectioning_part_appendix'}[7]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[7]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[7]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[7]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[6];
 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[8];
-$result_trees{'sectioning_part_appendix'}[8]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[7];
-$result_trees{'sectioning_part_appendix'}[8]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[8]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[8]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[8]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[7];
 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[9]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[9];
-$result_trees{'sectioning_part_appendix'}[9]{'element_prev'} = 
$result_trees{'sectioning_part_appendix'}[8];
-$result_trees{'sectioning_part_appendix'}[9]{'extra'}{'element_command'} = 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[9]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[9]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0];
+$result_trees{'sectioning_part_appendix'}[9]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[8];
 
 $result_texis{'sectioning_part_appendix'} = '@top top
 
@@ -844,7 +844,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                       'This' => {},
                                       'Up' => {}
                                     },
-                                    'element_command' => {
+                                    'section' => {
                                       'cmdname' => 'section',
                                       'extra' => {
                                         'spaces_before_argument' => ' '
@@ -852,9 +852,9 @@ $result_elements{'sectioning_part_appendix'} = [
                                       'level' => 2,
                                       'number' => '1.1'
                                     },
-                                    'section' => {}
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'FastBack' => {},
                                 'FastForward' => {},
@@ -862,7 +862,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'section' => {
                                 'cmdname' => 'subsection',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
@@ -870,9 +870,9 @@ $result_elements{'sectioning_part_appendix'} = [
                                 'level' => 3,
                                 'number' => '1.1.1'
                               },
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'FastBack' => {},
                           'FastForward' => {},
@@ -880,7 +880,7 @@ $result_elements{'sectioning_part_appendix'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'section' => {
                           'cmdname' => 'subsubsection',
                           'extra' => {
                             'spaces_before_argument' => ' '
@@ -888,9 +888,9 @@ $result_elements{'sectioning_part_appendix'} = [
                           'level' => 4,
                           'number' => '1.1.1.1'
                         },
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'FastBack' => {},
                     'FastForward' => {
@@ -916,7 +916,7 @@ $result_elements{'sectioning_part_appendix'} = [
                                             'This' => {},
                                             'Up' => {}
                                           },
-                                          'element_command' => {
+                                          'section' => {
                                             'cmdname' => 'appendixsec',
                                             'extra' => {
                                               'spaces_before_argument' => ' '
@@ -924,14 +924,14 @@ $result_elements{'sectioning_part_appendix'} = [
                                             'level' => 2,
                                             'number' => 'A.1'
                                           },
-                                          'section' => {}
+                                          'unit_command' => {}
                                         },
-                                        'type' => 'element'
+                                        'type' => 'unit'
                                       },
                                       'Prev' => {},
                                       'This' => {}
                                     },
-                                    'element_command' => {
+                                    'section' => {
                                       'cmdname' => 'appendix',
                                       'extra' => {
                                         'spaces_before_argument' => ' '
@@ -939,25 +939,25 @@ $result_elements{'sectioning_part_appendix'} = [
                                       'level' => 1,
                                       'number' => 'A'
                                     },
-                                    'section' => {}
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'Forward' => {},
                                 'Prev' => {},
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'section' => {
                                 'cmdname' => 'unnumbered',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
                                 },
                                 'level' => 1
                               },
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'Forward' => {},
                           'Next' => {},
@@ -965,7 +965,7 @@ $result_elements{'sectioning_part_appendix'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
                             'spaces_before_argument' => ' '
@@ -973,15 +973,15 @@ $result_elements{'sectioning_part_appendix'} = [
                           'level' => 1,
                           'number' => 3
                         },
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'Forward' => {},
                     'Next' => {},
                     'This' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'chapter',
                     'extra' => {
                       'associated_part' => {
@@ -996,15 +996,15 @@ $result_elements{'sectioning_part_appendix'} = [
                     'level' => 1,
                     'number' => 2
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
@@ -1012,24 +1012,24 @@ $result_elements{'sectioning_part_appendix'} = [
               'level' => 1,
               'number' => 1
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -1049,19 +1049,19 @@ 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForw
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -1073,33 +1073,33 @@ 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForw
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'
 [...]
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'F
 [...]
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Fas
 [...]
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'
 [...]
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastFor
 [...]
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'
 [...]
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForw
 [...]
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Fas
 [...]
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'sectioning_part_appendix'}[0];
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'Next'} 
= 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 $result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'This'} 
= $result_elements{'sectioning_part_appendix'}[0];
-$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'section'} = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'unit_command'} = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'section'};
 $result_elements{'sectioning_part_appendix'}[1] = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'sectioning_part_appendix'}[2] = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 $result_elements{'sectioning_part_appendix'}[3] = 
$result_elements{'sectioning_part_appendix'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
diff --git a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
index 7f42607..1ee2cb2 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
@@ -53,10 +53,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -99,12 +99,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -147,12 +147,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -195,12 +195,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -281,12 +281,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -329,12 +329,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -376,12 +376,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -424,12 +424,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -465,12 +465,12 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0];
@@ -478,29 +478,29 @@ 
$result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1]{'args'}[0]{'c
 
$result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1];
 
$result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1];
 $result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[0]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1];
 $result_trees{'sectioning_part_appendix_no_top'}[0]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1];
+$result_trees{'sectioning_part_appendix_no_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[1];
 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1];
-$result_trees{'sectioning_part_appendix_no_top'}[1]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[1]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[1]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[1]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2];
-$result_trees{'sectioning_part_appendix_no_top'}[2]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1];
-$result_trees{'sectioning_part_appendix_no_top'}[2]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[2]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[2]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[2]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1];
 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3];
-$result_trees{'sectioning_part_appendix_no_top'}[3]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2];
-$result_trees{'sectioning_part_appendix_no_top'}[3]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[3]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[3]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[3]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2];
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0];
@@ -510,36 +510,36 @@ 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1]{'args'}[0]{'p
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1];
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1]{'extra'}{'associated_part'}
 = $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4];
-$result_trees{'sectioning_part_appendix_no_top'}[4]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3];
-$result_trees{'sectioning_part_appendix_no_top'}[4]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1];
 $result_trees{'sectioning_part_appendix_no_top'}[4]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1];
+$result_trees{'sectioning_part_appendix_no_top'}[4]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1];
+$result_trees{'sectioning_part_appendix_no_top'}[4]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3];
 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5];
-$result_trees{'sectioning_part_appendix_no_top'}[5]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4];
-$result_trees{'sectioning_part_appendix_no_top'}[5]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[5]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[5]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[5]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4];
 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6];
-$result_trees{'sectioning_part_appendix_no_top'}[6]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5];
-$result_trees{'sectioning_part_appendix_no_top'}[6]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[6]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[6]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[6]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5];
 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7];
-$result_trees{'sectioning_part_appendix_no_top'}[7]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6];
-$result_trees{'sectioning_part_appendix_no_top'}[7]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[7]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[7]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[7]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6];
 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[8];
-$result_trees{'sectioning_part_appendix_no_top'}[8]{'element_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7];
-$result_trees{'sectioning_part_appendix_no_top'}[8]{'extra'}{'element_command'}
 = $result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[8]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[8]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[8]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7];
 
 $result_texis{'sectioning_part_appendix_no_top'} = '@chapter chapter
 
@@ -755,7 +755,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'section' => {
                                 'cmdname' => 'section',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
@@ -763,9 +763,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                 'level' => 2,
                                 'number' => '1.1'
                               },
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'FastBack' => {},
                           'FastForward' => {},
@@ -773,7 +773,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'section' => {
                           'cmdname' => 'subsection',
                           'extra' => {
                             'spaces_before_argument' => ' '
@@ -781,9 +781,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                           'level' => 3,
                           'number' => '1.1.1'
                         },
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'FastBack' => {},
                     'FastForward' => {},
@@ -791,7 +791,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'subsubsection',
                     'extra' => {
                       'spaces_before_argument' => ' '
@@ -799,9 +799,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'level' => 4,
                     'number' => '1.1.1.1'
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'FastBack' => {},
               'FastForward' => {
@@ -827,7 +827,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                       'This' => {},
                                       'Up' => {}
                                     },
-                                    'element_command' => {
+                                    'section' => {
                                       'cmdname' => 'appendixsec',
                                       'extra' => {
                                         'spaces_before_argument' => ' '
@@ -835,14 +835,14 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                       'level' => 2,
                                       'number' => 'A.1'
                                     },
-                                    'section' => {}
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'Prev' => {},
                                 'This' => {}
                               },
-                              'element_command' => {
+                              'section' => {
                                 'cmdname' => 'appendix',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
@@ -850,25 +850,25 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                                 'level' => 1,
                                 'number' => 'A'
                               },
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'Forward' => {},
                           'Prev' => {},
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'section' => {
                           'cmdname' => 'unnumbered',
                           'extra' => {
                             'spaces_before_argument' => ' '
                           },
                           'level' => 1
                         },
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'Forward' => {},
                     'Next' => {},
@@ -876,7 +876,7 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'chapter',
                     'extra' => {
                       'spaces_before_argument' => ' '
@@ -884,15 +884,15 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
                     'level' => 1,
                     'number' => 3
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
               'This' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'associated_part' => {
@@ -907,14 +907,14 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
               'level' => 1,
               'number' => 2
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'chapter',
         'extra' => {
           'spaces_before_argument' => ' '
@@ -922,9 +922,9 @@ $result_elements{'sectioning_part_appendix_no_top'} = [
         'level' => 1,
         'number' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -941,19 +941,19 @@ 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'F
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'sectioning_part_appendix_no_top'}[0];
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'sectioning_part_appendix_no_top'}[0];
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'sectioning_part_appendix_no_top'}[0];
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'sectioning_part_appendix_no_top'}[0];
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
@@ -965,28 +965,28 @@ 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'F
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 [...]
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}
 [...]
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directi
 [...]
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'sectioning_part_appendix_no_top'}[0];
-$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'section'} = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'element_command'};
+$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'unit_command'}
 = $result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'section'};
 $result_elements{'sectioning_part_appendix_no_top'}[1] = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 $result_elements{'sectioning_part_appendix_no_top'}[2] = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 $result_elements{'sectioning_part_appendix_no_top'}[3] = 
$result_elements{'sectioning_part_appendix_no_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
diff --git a/tp/t/results/sectioning/top_chapter_sections.pl 
b/tp/t/results/sectioning/top_chapter_sections.pl
index 8c1a487..f7c5945 100644
--- a/tp/t/results/sectioning/top_chapter_sections.pl
+++ b/tp/t/results/sectioning/top_chapter_sections.pl
@@ -52,10 +52,10 @@ $result_trees{'top_chapter_sections'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -97,12 +97,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -145,12 +145,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -193,12 +193,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -241,12 +241,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -289,12 +289,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -337,12 +337,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -385,12 +385,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -426,12 +426,12 @@ $result_trees{'top_chapter_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'top_chapter_sections'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[0];
@@ -439,63 +439,63 @@ 
$result_trees{'top_chapter_sections'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0
 $result_trees{'top_chapter_sections'}[0]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[0]{'contents'}[1];
 
$result_trees{'top_chapter_sections'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[0]{'contents'}[1];
 $result_trees{'top_chapter_sections'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'top_chapter_sections'}[0];
-$result_trees{'top_chapter_sections'}[0]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[0]{'contents'}[1];
 $result_trees{'top_chapter_sections'}[0]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[0]{'contents'}[1];
+$result_trees{'top_chapter_sections'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[0]{'contents'}[1];
 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[1]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[1];
-$result_trees{'top_chapter_sections'}[1]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[0];
-$result_trees{'top_chapter_sections'}[1]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[1]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[1]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[0];
 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[2]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[2];
-$result_trees{'top_chapter_sections'}[2]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[1];
-$result_trees{'top_chapter_sections'}[2]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[2]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[2]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[2]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[1];
 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[3]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[3];
-$result_trees{'top_chapter_sections'}[3]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[2];
-$result_trees{'top_chapter_sections'}[3]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[3]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[3]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[3]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[2];
 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[4]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[4];
-$result_trees{'top_chapter_sections'}[4]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[3];
-$result_trees{'top_chapter_sections'}[4]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[4]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[4]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[4]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[3];
 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[5]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[5];
-$result_trees{'top_chapter_sections'}[5]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[4];
-$result_trees{'top_chapter_sections'}[5]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[5]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[5]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[5]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[4];
 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[6]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[6];
-$result_trees{'top_chapter_sections'}[6]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[5];
-$result_trees{'top_chapter_sections'}[6]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[6]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[6]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[6]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[5];
 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[7]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[7];
-$result_trees{'top_chapter_sections'}[7]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[6];
-$result_trees{'top_chapter_sections'}[7]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[7]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[7]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[7]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[6];
 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[8];
-$result_trees{'top_chapter_sections'}[8]{'element_prev'} = 
$result_trees{'top_chapter_sections'}[7];
-$result_trees{'top_chapter_sections'}[8]{'extra'}{'element_command'} = 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[8]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[8]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0];
+$result_trees{'top_chapter_sections'}[8]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[7];
 
 $result_texis{'top_chapter_sections'} = '@top top
 
@@ -704,7 +704,7 @@ $result_elements{'top_chapter_sections'} = [
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'section' => {
                                 'cmdname' => 'section',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
@@ -712,9 +712,9 @@ $result_elements{'top_chapter_sections'} = [
                                 'level' => 2,
                                 'number' => '1.1'
                               },
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'FastBack' => {},
                           'FastForward' => {
@@ -736,7 +736,7 @@ $result_elements{'top_chapter_sections'} = [
                                                   'This' => {},
                                                   'Up' => {}
                                                 },
-                                                'element_command' => {
+                                                'section' => {
                                                   'cmdname' => 'section',
                                                   'extra' => {
                                                     'spaces_before_argument' 
=> ' '
@@ -744,9 +744,9 @@ $result_elements{'top_chapter_sections'} = [
                                                   'level' => 2,
                                                   'number' => '2.1'
                                                 },
-                                                'section' => {}
+                                                'unit_command' => {}
                                               },
-                                              'type' => 'element'
+                                              'type' => 'unit'
                                             },
                                             'FastBack' => {},
                                             'FastForward' => {},
@@ -755,7 +755,7 @@ $result_elements{'top_chapter_sections'} = [
                                             'This' => {},
                                             'Up' => {}
                                           },
-                                          'element_command' => {
+                                          'section' => {
                                             'cmdname' => 'subsection',
                                             'extra' => {
                                               'spaces_before_argument' => ' '
@@ -763,9 +763,9 @@ $result_elements{'top_chapter_sections'} = [
                                             'level' => 3,
                                             'number' => '2.1.1'
                                           },
-                                          'section' => {}
+                                          'unit_command' => {}
                                         },
-                                        'type' => 'element'
+                                        'type' => 'unit'
                                       },
                                       'FastBack' => {},
                                       'FastForward' => {},
@@ -774,7 +774,7 @@ $result_elements{'top_chapter_sections'} = [
                                       'This' => {},
                                       'Up' => {}
                                     },
-                                    'element_command' => {
+                                    'section' => {
                                       'cmdname' => 'subsection',
                                       'extra' => {
                                         'spaces_before_argument' => ' '
@@ -782,16 +782,16 @@ $result_elements{'top_chapter_sections'} = [
                                       'level' => 3,
                                       'number' => '2.1.2'
                                     },
-                                    'section' => {}
+                                    'unit_command' => {}
                                   },
-                                  'type' => 'element'
+                                  'type' => 'unit'
                                 },
                                 'FastBack' => {},
                                 'Prev' => {},
                                 'This' => {},
                                 'Up' => {}
                               },
-                              'element_command' => {
+                              'section' => {
                                 'cmdname' => 'chapter',
                                 'extra' => {
                                   'spaces_before_argument' => ' '
@@ -799,9 +799,9 @@ $result_elements{'top_chapter_sections'} = [
                                 'level' => 1,
                                 'number' => 3
                               },
-                              'section' => {}
+                              'unit_command' => {}
                             },
-                            'type' => 'element'
+                            'type' => 'unit'
                           },
                           'Forward' => {},
                           'Next' => {},
@@ -809,7 +809,7 @@ $result_elements{'top_chapter_sections'} = [
                           'This' => {},
                           'Up' => {}
                         },
-                        'element_command' => {
+                        'section' => {
                           'cmdname' => 'chapter',
                           'extra' => {
                             'spaces_before_argument' => ' '
@@ -817,9 +817,9 @@ $result_elements{'top_chapter_sections'} = [
                           'level' => 1,
                           'number' => 2
                         },
-                        'section' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'Forward' => {},
                     'Next' => {},
@@ -827,7 +827,7 @@ $result_elements{'top_chapter_sections'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
+                  'section' => {
                     'cmdname' => 'chapter',
                     'extra' => {
                       'spaces_before_argument' => ' '
@@ -835,39 +835,39 @@ $result_elements{'top_chapter_sections'} = [
                     'level' => 1,
                     'number' => 1
                   },
-                  'section' => {}
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'unnumbered',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'level' => 1
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -888,7 +888,7 @@ 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'element_command'};
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
@@ -896,46 +896,46 @@ 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'di
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{
 [...]
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directio
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'e
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extr
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extr
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'
 [...]
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'direct
 [...]
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'d
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'FastForward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extr
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'
 [...]
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'elemen
 [...]
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'s
 [...]
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'top_chapter_sections'}[0];
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'top_chapter_sections'}[0];
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'top_chapter_sections'}[0];
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'top_chapter_sections'}[0];
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'Forward'} 
= 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'top_chapter_sections'}[0];
-$result_elements{'top_chapter_sections'}[0]{'extra'}{'section'} = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'element_command'};
+$result_elements{'top_chapter_sections'}[0]{'extra'}{'unit_command'} = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'section'};
 $result_elements{'top_chapter_sections'}[1] = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'top_chapter_sections'}[2] = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 $result_elements{'top_chapter_sections'}[3] = 
$result_elements{'top_chapter_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'};
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 30e2097..981aa8f 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -131,11 +131,11 @@ $result_trees{'top_node_part_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'top_node_part_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_node_part_top'}[0];
@@ -153,9 +153,9 @@ 
$result_trees{'top_node_part_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'
 $result_trees{'top_node_part_top'}[0]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'top_node_part_top'}[0]{'contents'}[3];
 
$result_trees{'top_node_part_top'}[0]{'contents'}[3]{'extra'}{'associated_part'}
 = $result_trees{'top_node_part_top'}[0]{'contents'}[2];
 $result_trees{'top_node_part_top'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'top_node_part_top'}[0];
-$result_trees{'top_node_part_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'top_node_part_top'}[0]{'contents'}[3];
 $result_trees{'top_node_part_top'}[0]{'extra'}{'node'} = 
$result_trees{'top_node_part_top'}[0]{'contents'}[1];
 $result_trees{'top_node_part_top'}[0]{'extra'}{'section'} = 
$result_trees{'top_node_part_top'}[0]{'contents'}[3];
+$result_trees{'top_node_part_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_node_part_top'}[0]{'contents'}[3];
 
 $result_texis{'top_node_part_top'} = '@node Top
 
@@ -271,7 +271,14 @@ $result_elements{'top_node_part_top'} = [
       'directions' => {
         'This' => {}
       },
-      'element_command' => {
+      'node' => {
+        'cmdname' => 'node',
+        'extra' => {
+          'normalized' => 'Top',
+          'spaces_before_argument' => ' '
+        }
+      },
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'associated_part' => {
@@ -285,20 +292,13 @@ $result_elements{'top_node_part_top'} = [
         },
         'level' => 0
       },
-      'node' => {
-        'cmdname' => 'node',
-        'extra' => {
-          'normalized' => 'Top',
-          'spaces_before_argument' => ' '
-        }
-      },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'top_node_part_top'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'top_node_part_top'}[0];
-$result_elements{'top_node_part_top'}[0]{'extra'}{'section'} = 
$result_elements{'top_node_part_top'}[0]{'extra'}{'element_command'};
+$result_elements{'top_node_part_top'}[0]{'extra'}{'unit_command'} = 
$result_elements{'top_node_part_top'}[0]{'extra'}{'section'};
 
 
 
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index e8a9da8..64ec851 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -209,11 +209,11 @@ $result_trees{'top_node_up_url'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -259,12 +259,12 @@ $result_trees{'top_node_up_url'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_node_up_url'}[0];
@@ -295,17 +295,17 @@ 
$result_trees{'top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_
 $result_trees{'top_node_up_url'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[2];
 $result_trees{'top_node_up_url'}[0]{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[2];
 $result_trees{'top_node_up_url'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'top_node_up_url'}[0];
-$result_trees{'top_node_up_url'}[0]{'extra'}{'element_command'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[1];
 $result_trees{'top_node_up_url'}[0]{'extra'}{'node'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[1];
 $result_trees{'top_node_up_url'}[0]{'extra'}{'section'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[2];
+$result_trees{'top_node_up_url'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_node_up_url'}[0]{'contents'}[1];
 
$result_trees{'top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_node_up_url'}[1]{'contents'}[0];
 $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'extra'}{'node_content'}[0] 
= $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'top_node_up_url'}[1];
-$result_trees{'top_node_up_url'}[1]{'element_prev'} = 
$result_trees{'top_node_up_url'}[0];
-$result_trees{'top_node_up_url'}[1]{'extra'}{'element_command'} = 
$result_trees{'top_node_up_url'}[1]{'contents'}[0];
 $result_trees{'top_node_up_url'}[1]{'extra'}{'node'} = 
$result_trees{'top_node_up_url'}[1]{'contents'}[0];
+$result_trees{'top_node_up_url'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_node_up_url'}[1]{'contents'}[0];
+$result_trees{'top_node_up_url'}[1]{'unit_prev'} = 
$result_trees{'top_node_up_url'}[0];
 
 $result_texis{'top_node_up_url'} = '@node Top
 @top internal top node up
@@ -430,7 +430,7 @@ $result_elements{'top_node_up_url'} = [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'first',
@@ -448,15 +448,14 @@ $result_elements{'top_node_up_url'} = [
                 'Top' => 1
               }
             },
-            'node' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
       'node' => {},
       'section' => {
         'cmdname' => 'top',
@@ -464,9 +463,10 @@ $result_elements{'top_node_up_url'} = [
           'spaces_before_argument' => ' '
         },
         'level' => 0
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -476,13 +476,13 @@ 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'
 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'top_node_up_url'}[0];
 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'top_node_up_url'}[0];
 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'NodeForward'} = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'NodeNext'} = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'top_node_up_url'}[0];
-$result_elements{'top_node_up_url'}[0]{'extra'}{'element_command'} = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
-$result_elements{'top_node_up_url'}[0]{'extra'}{'node'} = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'};
+$result_elements{'top_node_up_url'}[0]{'extra'}{'node'} = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
+$result_elements{'top_node_up_url'}[0]{'extra'}{'unit_command'} = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'};
 $result_elements{'top_node_up_url'}[1] = 
$result_elements{'top_node_up_url'}[0]{'extra'}{'directions'}{'Forward'};
 
 
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 3ce96d0..38c5af2 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -52,10 +52,10 @@ $result_trees{'top_part_chapter'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -129,12 +129,12 @@ $result_trees{'top_part_chapter'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'top_part_chapter'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_part_chapter'}[0];
@@ -142,8 +142,8 @@ 
$result_trees{'top_part_chapter'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'p
 $result_trees{'top_part_chapter'}[0]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'top_part_chapter'}[0]{'contents'}[1];
 $result_trees{'top_part_chapter'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'top_part_chapter'}[0]{'contents'}[1];
 $result_trees{'top_part_chapter'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'top_part_chapter'}[0];
-$result_trees{'top_part_chapter'}[0]{'extra'}{'element_command'} = 
$result_trees{'top_part_chapter'}[0]{'contents'}[1];
 $result_trees{'top_part_chapter'}[0]{'extra'}{'section'} = 
$result_trees{'top_part_chapter'}[0]{'contents'}[1];
+$result_trees{'top_part_chapter'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_part_chapter'}[0]{'contents'}[1];
 
$result_trees{'top_part_chapter'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_part_chapter'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'top_part_chapter'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[0];
 $result_trees{'top_part_chapter'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[0];
@@ -152,9 +152,9 @@ 
$result_trees{'top_part_chapter'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'p
 $result_trees{'top_part_chapter'}[1]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[1];
 
$result_trees{'top_part_chapter'}[1]{'contents'}[1]{'extra'}{'associated_part'} 
= $result_trees{'top_part_chapter'}[1]{'contents'}[0];
 $result_trees{'top_part_chapter'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'top_part_chapter'}[1];
-$result_trees{'top_part_chapter'}[1]{'element_prev'} = 
$result_trees{'top_part_chapter'}[0];
-$result_trees{'top_part_chapter'}[1]{'extra'}{'element_command'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[1];
 $result_trees{'top_part_chapter'}[1]{'extra'}{'section'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[1];
+$result_trees{'top_part_chapter'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[1];
+$result_trees{'top_part_chapter'}[1]{'unit_prev'} = 
$result_trees{'top_part_chapter'}[0];
 
 $result_texis{'top_part_chapter'} = '@top top
 
@@ -237,7 +237,7 @@ $result_elements{'top_part_chapter'} = [
               'FastBack' => {},
               'This' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'associated_part' => {
@@ -252,35 +252,35 @@ $result_elements{'top_part_chapter'} = [
               'level' => 1,
               'number' => 1
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = $result_elements{'top_part_chapter'}[0];
 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'top_part_chapter'}[0];
 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'Forward'} = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'Next'} = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'top_part_chapter'}[0];
-$result_elements{'top_part_chapter'}[0]{'extra'}{'section'} = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'element_command'};
+$result_elements{'top_part_chapter'}[0]{'extra'}{'unit_command'} = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'section'};
 $result_elements{'top_part_chapter'}[1] = 
$result_elements{'top_part_chapter'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/top_without_node_nodes.pl 
b/tp/t/results/sectioning/top_without_node_nodes.pl
index 1780a59..24211c4 100644
--- a/tp/t/results/sectioning/top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/top_without_node_nodes.pl
@@ -188,11 +188,11 @@ $result_trees{'top_without_node_nodes'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'top_without_node_nodes'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_without_node_nodes'}[0];
@@ -220,9 +220,9 @@ 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[3]{'contents'}[0]{'parent
 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'top_without_node_nodes'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'top_without_node_nodes'}[0]{'contents'}[3];
 $result_trees{'top_without_node_nodes'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'top_without_node_nodes'}[0];
-$result_trees{'top_without_node_nodes'}[0]{'extra'}{'element_command'} = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2];
 $result_trees{'top_without_node_nodes'}[0]{'extra'}{'node'} = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2];
 $result_trees{'top_without_node_nodes'}[0]{'extra'}{'section'} = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[3];
+$result_trees{'top_without_node_nodes'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_without_node_nodes'}[0]{'contents'}[2];
 
 $result_texis{'top_without_node_nodes'} = '@top top section
 Top section
@@ -337,14 +337,13 @@ $result_elements{'top_without_node_nodes'} = [
         },
         'This' => {}
       },
-      'element_command' => {
+      'node' => {
         'cmdname' => 'node',
         'extra' => {
           'normalized' => 'second',
           'spaces_before_argument' => ' '
         }
       },
-      'node' => {},
       'section' => {
         'cmdname' => 'chapter',
         'extra' => {
@@ -352,13 +351,14 @@ $result_elements{'top_without_node_nodes'} = [
         },
         'level' => 1,
         'number' => 1
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'top_without_node_nodes'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'top_without_node_nodes'}[0];
-$result_elements{'top_without_node_nodes'}[0]{'extra'}{'node'} = 
$result_elements{'top_without_node_nodes'}[0]{'extra'}{'element_command'};
+$result_elements{'top_without_node_nodes'}[0]{'extra'}{'unit_command'} = 
$result_elements{'top_without_node_nodes'}[0]{'extra'}{'node'};
 
 
 
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index b2a791f..c379d18 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -63,10 +63,10 @@ $result_trees{'top_without_node_sections'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -196,13 +196,13 @@ $result_trees{'top_without_node_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'top_without_node_sections'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_without_node_sections'}[0];
@@ -212,8 +212,8 @@ 
$result_trees{'top_without_node_sections'}[0]{'contents'}[1]{'contents'}[0]{'con
 
$result_trees{'top_without_node_sections'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'top_without_node_sections'}[0]{'contents'}[1];
 
$result_trees{'top_without_node_sections'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'top_without_node_sections'}[0]{'contents'}[1];
 $result_trees{'top_without_node_sections'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'top_without_node_sections'}[0];
-$result_trees{'top_without_node_sections'}[0]{'extra'}{'element_command'} = 
$result_trees{'top_without_node_sections'}[0]{'contents'}[1];
 $result_trees{'top_without_node_sections'}[0]{'extra'}{'section'} = 
$result_trees{'top_without_node_sections'}[0]{'contents'}[1];
+$result_trees{'top_without_node_sections'}[0]{'extra'}{'unit_command'} = 
$result_trees{'top_without_node_sections'}[0]{'contents'}[1];
 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'top_without_node_sections'}[1]{'contents'}[0];
 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'top_without_node_sections'}[1]{'contents'}[0];
@@ -232,10 +232,10 @@ 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1]{'contents'}[0]{'par
 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'top_without_node_sections'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'top_without_node_sections'}[1]{'contents'}[1];
 $result_trees{'top_without_node_sections'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'top_without_node_sections'}[1];
-$result_trees{'top_without_node_sections'}[1]{'element_prev'} = 
$result_trees{'top_without_node_sections'}[0];
-$result_trees{'top_without_node_sections'}[1]{'extra'}{'element_command'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1];
 $result_trees{'top_without_node_sections'}[1]{'extra'}{'node'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0];
 $result_trees{'top_without_node_sections'}[1]{'extra'}{'section'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1];
+$result_trees{'top_without_node_sections'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1];
+$result_trees{'top_without_node_sections'}[1]{'unit_prev'} = 
$result_trees{'top_without_node_sections'}[0];
 
 $result_texis{'top_without_node_sections'} = '@top top section
 Top section
@@ -356,14 +356,6 @@ $result_elements{'top_without_node_sections'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -371,23 +363,31 @@ $result_elements{'top_without_node_sections'} = [
                 'spaces_before_argument' => ' '
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -395,10 +395,10 @@ 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastFor
 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'top_without_node_sections'}[0];
 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'top_without_node_sections'}[0];
-$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'This'} 
= $result_elements{'top_without_node_sections'}[0];
-$result_elements{'top_without_node_sections'}[0]{'extra'}{'section'} = 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'element_command'};
+$result_elements{'top_without_node_sections'}[0]{'extra'}{'unit_command'} = 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'section'};
 $result_elements{'top_without_node_sections'}[1] = 
$result_elements{'top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 64bf2a0..043df47 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -329,10 +329,10 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -403,12 +403,12 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -461,12 +461,12 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -530,12 +530,12 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[0];
@@ -587,8 +587,8 @@ 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'conten
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'element_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1];
 $result_trees{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1];
+$result_trees{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0];
@@ -597,18 +597,18 @@ 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'conten
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1];
-$result_trees{'transliterated_split_equivalent_nodes'}[1]{'element_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[1]{'extra'}{'element_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0];
 $result_trees{'transliterated_split_equivalent_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[1]{'unit_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2];
-$result_trees{'transliterated_split_equivalent_nodes'}[2]{'element_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[1];
-$result_trees{'transliterated_split_equivalent_nodes'}[2]{'extra'}{'element_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
 $result_trees{'transliterated_split_equivalent_nodes'}[2]{'extra'}{'node'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[2]{'unit_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0];
@@ -616,9 +616,9 @@ 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3];
-$result_trees{'transliterated_split_equivalent_nodes'}[3]{'element_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[2];
-$result_trees{'transliterated_split_equivalent_nodes'}[3]{'extra'}{'element_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0];
 $result_trees{'transliterated_split_equivalent_nodes'}[3]{'extra'}{'node'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[3]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[3]{'unit_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[2];
 
 $result_texis{'transliterated_split_equivalent_nodes'} = '@node Top
 
@@ -780,7 +780,7 @@ $result_elements{'transliterated_split_equivalent_nodes'} = 
[
                           'NodeUp' => {},
                           'This' => {}
                         },
-                        'element_command' => {
+                        'node' => {
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => '_00e2',
@@ -822,9 +822,9 @@ $result_elements{'transliterated_split_equivalent_nodes'} = 
[
                             'Top' => 1
                           }
                         },
-                        'node' => {}
+                        'unit_command' => {}
                       },
-                      'type' => 'element'
+                      'type' => 'unit'
                     },
                     'NodeBack' => {},
                     'NodeForward' => {},
@@ -833,10 +833,10 @@ $result_elements{'transliterated_split_equivalent_nodes'} 
= [
                     'NodeUp' => {},
                     'This' => {}
                   },
-                  'element_command' => {},
-                  'node' => {}
+                  'node' => {},
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'NodeBack' => {},
               'NodeForward' => {},
@@ -845,19 +845,19 @@ $result_elements{'transliterated_split_equivalent_nodes'} 
= [
               'NodeUp' => {},
               'This' => {}
             },
-            'element_command' => {},
-            'node' => {}
+            'node' => {},
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {},
-      'node' => {}
+      'node' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {},
@@ -870,33 +870,33 @@ 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'direction
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'transliterated_split_equivalent_nodes'}[0];
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'transliterated_split_equivalent_nodes'}[0];
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'transliterated_split_equivalent_nodes'}[0];
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'transliterated_split_equivalent_nodes'}[0];
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'transliterated_split_equivalent_nodes'}[0];
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'transliterated_split_equivalent_nodes'}[0];
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'element_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
-$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'} 
= 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'node'} 
= 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
+$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
 $result_elements{'transliterated_split_equivalent_nodes'}[1] = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 $result_elements{'transliterated_split_equivalent_nodes'}[2] = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
 $result_elements{'transliterated_split_equivalent_nodes'}[3] = 
$result_elements{'transliterated_split_equivalent_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Forward'};
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 15a759c..299d95f 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -323,11 +323,11 @@ $result_trees{'two_nodes_at_the_end'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -572,13 +572,13 @@ $result_trees{'two_nodes_at_the_end'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'two_nodes_at_the_end'}[0];
@@ -629,9 +629,9 @@ 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2];
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2];
 $result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'two_nodes_at_the_end'}[0];
-$result_trees{'two_nodes_at_the_end'}[0]{'extra'}{'element_command'} = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2];
 $result_trees{'two_nodes_at_the_end'}[0]{'extra'}{'node'} = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[1];
 $result_trees{'two_nodes_at_the_end'}[0]{'extra'}{'section'} = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2];
+$result_trees{'two_nodes_at_the_end'}[0]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[2];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0];
 $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0]{'args'}[1];
@@ -664,10 +664,10 @@ 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'two_nodes_at_the_end'}[1];
-$result_trees{'two_nodes_at_the_end'}[1]{'element_prev'} = 
$result_trees{'two_nodes_at_the_end'}[0];
-$result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'element_command'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[1];
 $result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'node'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0];
 $result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'section'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[1];
+$result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[1];
+$result_trees{'two_nodes_at_the_end'}[1]{'unit_prev'} = 
$result_trees{'two_nodes_at_the_end'}[0];
 
 $result_texis{'two_nodes_at_the_end'} = '@node Top
 @top top
@@ -893,14 +893,6 @@ $result_elements{'two_nodes_at_the_end'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
-              'cmdname' => 'chapter',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1,
-              'number' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -943,26 +935,34 @@ $result_elements{'two_nodes_at_the_end'} = [
                 'Top' => 1
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'chapter',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1,
+              'number' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'NodeForward' => {},
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -980,13 +980,13 @@ 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'
 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_next'}{'menu_prev'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_next'}{'menu_up'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'};
 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'};
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'Forward'} 
= 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'NodeNext'} 
= 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'two_nodes_at_the_end'}[0];
 $result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'node'} = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_next'}{'menu_next'}{'menu_up'};
-$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'section'} = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'element_command'};
+$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'unit_command'} = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'section'};
 $result_elements{'two_nodes_at_the_end'}[1] = 
$result_elements{'two_nodes_at_the_end'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index d9dff6b..23a503a 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -323,11 +323,11 @@ $result_trees{'two_nodes_between_chapters'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -514,13 +514,13 @@ $result_trees{'two_nodes_between_chapters'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -597,13 +597,13 @@ $result_trees{'two_nodes_between_chapters'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'two_nodes_between_chapters'}[0];
@@ -654,9 +654,9 @@ 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'ex
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2];
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2];
 $result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'two_nodes_between_chapters'}[0];
-$result_trees{'two_nodes_between_chapters'}[0]{'extra'}{'element_command'} = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2];
 $result_trees{'two_nodes_between_chapters'}[0]{'extra'}{'node'} = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[1];
 $result_trees{'two_nodes_between_chapters'}[0]{'extra'}{'section'} = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2];
+$result_trees{'two_nodes_between_chapters'}[0]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[2];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0]{'args'}[1];
@@ -681,10 +681,10 @@ 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'contents'}[0]{'pa
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'two_nodes_between_chapters'}[1];
-$result_trees{'two_nodes_between_chapters'}[1]{'element_prev'} = 
$result_trees{'two_nodes_between_chapters'}[0];
-$result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'element_command'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[1];
 $result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'node'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'section'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[1];
+$result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[1];
+$result_trees{'two_nodes_between_chapters'}[1]{'unit_prev'} = 
$result_trees{'two_nodes_between_chapters'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -693,10 +693,10 @@ 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'parent'} = $resul
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1];
 $result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'two_nodes_between_chapters'}[2];
-$result_trees{'two_nodes_between_chapters'}[2]{'element_prev'} = 
$result_trees{'two_nodes_between_chapters'}[1];
-$result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'element_command'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1];
 $result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'node'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'section'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1];
+$result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1];
+$result_trees{'two_nodes_between_chapters'}[2]{'unit_prev'} = 
$result_trees{'two_nodes_between_chapters'}[1];
 
 $result_texis{'two_nodes_between_chapters'} = '@node Top
 @top top
@@ -974,14 +974,6 @@ $result_elements{'two_nodes_between_chapters'} = [
                     'This' => {},
                     'Up' => {}
                   },
-                  'element_command' => {
-                    'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'level' => 1,
-                    'number' => 2
-                  },
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -1024,9 +1016,17 @@ $result_elements{'two_nodes_between_chapters'} = [
                       'Top' => 1
                     }
                   },
-                  'section' => {}
+                  'section' => {
+                    'cmdname' => 'chapter',
+                    'extra' => {
+                      'spaces_before_argument' => ' '
+                    },
+                    'level' => 1,
+                    'number' => 2
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
@@ -1038,7 +1038,8 @@ $result_elements{'two_nodes_between_chapters'} = [
               'This' => {},
               'Up' => {}
             },
-            'element_command' => {
+            'node' => {},
+            'section' => {
               'cmdname' => 'chapter',
               'extra' => {
                 'spaces_before_argument' => ' '
@@ -1046,10 +1047,9 @@ $result_elements{'two_nodes_between_chapters'} = [
               'level' => 1,
               'number' => 1
             },
-            'node' => {},
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'NodeBack' => {},
@@ -1057,17 +1057,17 @@ $result_elements{'two_nodes_between_chapters'} = [
         'NodeNext' => {},
         'This' => {}
       },
-      'element_command' => {
+      'node' => {},
+      'section' => {
         'cmdname' => 'top',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 0
       },
-      'node' => {},
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -1086,7 +1086,7 @@ 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastFo
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'two_nodes_between_chapters'}[0];
@@ -1097,14 +1097,14 @@ 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastFo
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'two_nodes_between_chapters'}[0];
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'NodeBack'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'two_nodes_between_chapters'}[0];
 $result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'node'} = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_prev'}{'menu_up'};
-$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'section'} = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'element_command'};
+$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'unit_command'} = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'section'};
 $result_elements{'two_nodes_between_chapters'}[1] = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'two_nodes_between_chapters'}[2] = 
$result_elements{'two_nodes_between_chapters'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
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 b39aa19..172665e 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -69,10 +69,10 @@ $result_trees{'unnumbered_before_node_top_top'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -160,13 +160,13 @@ $result_trees{'unnumbered_before_node_top_top'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'unnumbered_before_node_top_top'}[0];
@@ -177,8 +177,8 @@ 
$result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1]{'contents'}[1]
 
$result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1];
 
$result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1];
 $result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'unnumbered_before_node_top_top'}[0];
-$result_trees{'unnumbered_before_node_top_top'}[0]{'extra'}{'element_command'} 
= $result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1];
 $result_trees{'unnumbered_before_node_top_top'}[0]{'extra'}{'section'} = 
$result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1];
+$result_trees{'unnumbered_before_node_top_top'}[0]{'extra'}{'unit_command'} = 
$result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[1];
 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0];
 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -189,10 +189,10 @@ 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1]{'args'}[0]{'pa
 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1];
 $result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'unnumbered_before_node_top_top'}[1];
-$result_trees{'unnumbered_before_node_top_top'}[1]{'element_prev'} = 
$result_trees{'unnumbered_before_node_top_top'}[0];
-$result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'element_command'} 
= $result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1];
 $result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'node'} = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0];
 $result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'section'} = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1];
+$result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1];
+$result_trees{'unnumbered_before_node_top_top'}[1]{'unit_prev'} = 
$result_trees{'unnumbered_before_node_top_top'}[0];
 
 $result_texis{'unnumbered_before_node_top_top'} = '@unnumbered before nodes
 
@@ -300,13 +300,6 @@ $result_elements{'unnumbered_before_node_top_top'} = [
               'Prev' => {},
               'This' => {}
             },
-            'element_command' => {
-              'cmdname' => 'top',
-              'extra' => {
-                'spaces_before_argument' => ' '
-              },
-              'level' => 1
-            },
             'node' => {
               'cmdname' => 'node',
               'extra' => {
@@ -314,24 +307,31 @@ $result_elements{'unnumbered_before_node_top_top'} = [
                 'spaces_before_argument' => ' '
               }
             },
-            'section' => {}
+            'section' => {
+              'cmdname' => 'top',
+              'extra' => {
+                'spaces_before_argument' => ' '
+              },
+              'level' => 1
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'unnumbered',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -339,11 +339,11 @@ 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'Fa
 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'unnumbered_before_node_top_top'}[0];
 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = $result_elements{'unnumbered_before_node_top_top'}[0];
 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'unnumbered_before_node_top_top'}[0];
-$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'section'} = 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'element_command'};
+$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'unit_command'} 
= $result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'section'};
 $result_elements{'unnumbered_before_node_top_top'}[1] = 
$result_elements{'unnumbered_before_node_top_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
 
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl 
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index 0a3f0a1..7c471f8 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -138,10 +138,10 @@ $result_trees{'unnumbered_before_top_node'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'unnumbered_before_top_node'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'unnumbered_before_top_node'}[0];
@@ -161,8 +161,8 @@ 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'contents'}[3]{'pa
 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'unnumbered_before_top_node'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'unnumbered_before_top_node'}[0];
-$result_trees{'unnumbered_before_top_node'}[0]{'extra'}{'element_command'} = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[1];
 $result_trees{'unnumbered_before_top_node'}[0]{'extra'}{'section'} = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[1];
+$result_trees{'unnumbered_before_top_node'}[0]{'extra'}{'unit_command'} = 
$result_trees{'unnumbered_before_top_node'}[0]{'contents'}[1];
 
 $result_texis{'unnumbered_before_top_node'} = '@unnumbered before nodes
 
@@ -224,20 +224,20 @@ $result_elements{'unnumbered_before_top_node'} = [
       'directions' => {
         'This' => {}
       },
-      'element_command' => {
+      'section' => {
         'cmdname' => 'unnumbered',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 1
       },
-      'section' => {}
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 
$result_elements{'unnumbered_before_top_node'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'unnumbered_before_top_node'}[0];
-$result_elements{'unnumbered_before_top_node'}[0]{'extra'}{'section'} = 
$result_elements{'unnumbered_before_top_node'}[0]{'extra'}{'element_command'};
+$result_elements{'unnumbered_before_top_node'}[0]{'extra'}{'unit_command'} = 
$result_elements{'unnumbered_before_top_node'}[0]{'extra'}{'section'};
 
 
 
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 eb19c45..743bf61 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -193,11 +193,11 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -327,13 +327,13 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[0];
@@ -362,9 +362,9 @@ 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[3]{'contents'}
 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[3];
 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[3];
 $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[0];
-$result_trees{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'element_command'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'node'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[2];
+$result_trees{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'unit_command'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[1];
 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
@@ -383,10 +383,10 @@ 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1]{'contents'}
 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[1];
-$result_trees{'unnumbered_top_without_node_nodes'}[1]{'element_prev'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[0];
-$result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'element_command'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1];
+$result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'unit_command'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
+$result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_prev'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[0];
 
 $result_texis{'unnumbered_top_without_node_nodes'} = '@node a node,,,(dir)
 @unnumbered unnumbered
@@ -556,14 +556,13 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
               'Prev' => {},
               'This' => {}
             },
-            'element_command' => {
+            'node' => {
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'second',
                 'spaces_before_argument' => ' '
               }
             },
-            'node' => {},
             'section' => {
               'cmdname' => 'chapter',
               'extra' => {
@@ -571,9 +570,10 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
               },
               'level' => 1,
               'number' => 1
-            }
+            },
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'NodeUp' => {
           'extra' => {
@@ -587,23 +587,23 @@ $result_elements{'unnumbered_top_without_node_nodes'} = [
         },
         'This' => {}
       },
-      'element_command' => {
+      'node' => {
         'cmdname' => 'node',
         'extra' => {
           'normalized' => 'a-node',
           'spaces_before_argument' => ' '
         }
       },
-      'node' => {},
       'section' => {
         'cmdname' => 'unnumbered',
         'extra' => {
           'spaces_before_argument' => ' '
         },
         'level' => 1
-      }
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {}
 ];
@@ -612,9 +612,9 @@ 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{
 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Back'}
 = $result_elements{'unnumbered_top_without_node_nodes'}[0];
 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'Prev'}
 = $result_elements{'unnumbered_top_without_node_nodes'}[0];
 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'};
-$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'}
 = 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'element_command'};
+$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'unit_command'}
 = 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'}{'extra'}{'node'};
 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'unnumbered_top_without_node_nodes'}[0];
-$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'node'} = 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'element_command'};
+$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'unit_command'}
 = $result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'node'};
 $result_elements{'unnumbered_top_without_node_nodes'}[1] = 
$result_elements{'unnumbered_top_without_node_nodes'}[0]{'extra'}{'directions'}{'Forward'};
 
 
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 b6fb919..5d20e32 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -145,11 +145,11 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
       }
     ],
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -202,12 +202,12 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   },
   {
     'contents' => [
@@ -337,13 +337,13 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
         'parent' => {}
       }
     ],
-    'element_prev' => {},
     'extra' => {
-      'element_command' => {},
       'node' => {},
-      'section' => {}
+      'section' => {},
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit',
+    'unit_prev' => {}
   }
 ];
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0];
@@ -366,18 +366,18 @@ 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2]{'content
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2];
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2];
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0];
-$result_trees{'unnumbered_top_without_node_sections'}[0]{'extra'}{'element_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2];
 $result_trees{'unnumbered_top_without_node_sections'}[0]{'extra'}{'node'} = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_sections'}[0]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2];
+$result_trees{'unnumbered_top_without_node_sections'}[0]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[2];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1];
-$result_trees{'unnumbered_top_without_node_sections'}[1]{'element_prev'} = 
$result_trees{'unnumbered_top_without_node_sections'}[0];
-$result_trees{'unnumbered_top_without_node_sections'}[1]{'extra'}{'element_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
 $result_trees{'unnumbered_top_without_node_sections'}[1]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
+$result_trees{'unnumbered_top_without_node_sections'}[1]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
+$result_trees{'unnumbered_top_without_node_sections'}[1]{'unit_prev'} = 
$result_trees{'unnumbered_top_without_node_sections'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0];
@@ -396,10 +396,10 @@ 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1]{'content
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2];
-$result_trees{'unnumbered_top_without_node_sections'}[2]{'element_prev'} = 
$result_trees{'unnumbered_top_without_node_sections'}[1];
-$result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'element_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'node'} = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0];
 $result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1];
+$result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1];
+$result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_prev'} = 
$result_trees{'unnumbered_top_without_node_sections'}[1];
 
 $result_texis{'unnumbered_top_without_node_sections'} = '@node a node,,,(dir)
 @unnumbered unnumbered
@@ -573,14 +573,6 @@ $result_elements{'unnumbered_top_without_node_sections'} = 
[
                     'Prev' => {},
                     'This' => {}
                   },
-                  'element_command' => {
-                    'cmdname' => 'chapter',
-                    'extra' => {
-                      'spaces_before_argument' => ' '
-                    },
-                    'level' => 1,
-                    'number' => 1
-                  },
                   'node' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -588,25 +580,33 @@ $result_elements{'unnumbered_top_without_node_sections'} 
= [
                       'spaces_before_argument' => ' '
                     }
                   },
-                  'section' => {}
+                  'section' => {
+                    'cmdname' => 'chapter',
+                    'extra' => {
+                      'spaces_before_argument' => ' '
+                    },
+                    'level' => 1,
+                    'number' => 1
+                  },
+                  'unit_command' => {}
                 },
-                'type' => 'element'
+                'type' => 'unit'
               },
               'Forward' => {},
               'Next' => {},
               'Prev' => {},
               'This' => {}
             },
-            'element_command' => {
+            'section' => {
               'cmdname' => 'top',
               'extra' => {
                 'spaces_before_argument' => ' '
               },
               'level' => 1
             },
-            'section' => {}
+            'unit_command' => {}
           },
-          'type' => 'element'
+          'type' => 'unit'
         },
         'Forward' => {},
         'Next' => {},
@@ -622,13 +622,6 @@ $result_elements{'unnumbered_top_without_node_sections'} = 
[
         },
         'This' => {}
       },
-      'element_command' => {
-        'cmdname' => 'unnumbered',
-        'extra' => {
-          'spaces_before_argument' => ' '
-        },
-        'level' => 1
-      },
       'node' => {
         'cmdname' => 'node',
         'extra' => {
@@ -636,9 +629,16 @@ $result_elements{'unnumbered_top_without_node_sections'} = 
[
           'spaces_before_argument' => ' '
         }
       },
-      'section' => {}
+      'section' => {
+        'cmdname' => 'unnumbered',
+        'extra' => {
+          'spaces_before_argument' => ' '
+        },
+        'level' => 1
+      },
+      'unit_command' => {}
     },
-    'type' => 'element'
+    'type' => 'unit'
   },
   {},
   {}
@@ -649,16 +649,16 @@ 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
-$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Prev'}
 = $result_elements{'unnumbered_top_without_node_sections'}[0];
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
+$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'unit_command'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'unnumbered_top_without_node_sections'}[0];
-$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'section'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'element_command'};
+$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'unit_command'}
 = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'section'};
 $result_elements{'unnumbered_top_without_node_sections'}[1] = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'};
 $result_elements{'unnumbered_top_without_node_sections'}[2] = 
$result_elements{'unnumbered_top_without_node_sections'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastForward'};
 
diff --git a/tp/t/results/xml_tests/node_and_bye.pl 
b/tp/t/results/xml_tests/node_and_bye.pl
index 381c4a2..3f327ef 100644
--- a/tp/t/results/xml_tests/node_and_bye.pl
+++ b/tp/t/results/xml_tests/node_and_bye.pl
@@ -77,7 +77,7 @@ $result_trees{'node_and_bye'} = [
     'extra' => {
       'no_section' => 1
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_trees{'node_and_bye'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node_and_bye'}[0];
@@ -131,15 +131,15 @@ $result_elements{'node_and_bye'} = [
       },
       'no_section' => 1
     },
-    'type' => 'element'
+    'type' => 'unit'
   }
 ];
 $result_elements{'node_and_bye'}[0]{'extra'}{'directions'}{'This'} = 
$result_elements{'node_and_bye'}[0];
 
 
 
-$result_directions_text{'node_and_bye'} = 'element: No associated command 
(type element)
-  This: No associated command (type element)
+$result_directions_text{'node_and_bye'} = 'element: No associated command 
(type unit)
+  This: No associated command (type unit)
 ';
 
 
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 678108c..b926d67 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -474,7 +474,7 @@ my @node_keys = ('node_next', 'node_prev', 'node_up', 
'menus',
   'associated_section');
 my %avoided_keys_tree;
 our @avoided_keys_tree = (@sections_keys, @menus_keys, @node_keys, 
-   'menu_child', 'element_next', 'directions', 'page_next', 'remaining_args');
+   'menu_child', 'unit_next', 'directions', 'page_next', 'remaining_args');
 foreach my $avoided_key(@avoided_keys_tree) {
   $avoided_keys_tree{$avoided_key} = 1;
 }
@@ -519,7 +519,7 @@ sub filter_floats_keys { [grep {!$avoided_keys_floats{$_}}
 
 my %avoided_keys_elements;
 my @avoided_keys_elements = (@contents_keys, @sections_keys, @node_keys,
-  'element_next', 'element_prev');
+  'unit_next', 'unit_prev');
 foreach my $avoided_key(@avoided_keys_elements) {
   $avoided_keys_elements{$avoided_key} = 1;
 }



reply via email to

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