diff --git a/lib/command.c b/lib/command.c
index 6294e994e7..cb1f54fbbd 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1268,7 +1268,7 @@ permute (struct graph_node *start, struct vty *vty)
       for (ALL_LIST_ELEMENTS_RO (position,ln,gnn))
       {
         struct cmd_token *tt = gnn->data;
-        if (tt->type < SELECTOR_TKN)
+        if (tt->type < SPECIAL_TKN)
           vty_out (vty, " %s", tt->text);
       }
       if (gn == start)
diff --git a/lib/command.h b/lib/command.h
index 1e1698fc7d..dd940f0d57 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -176,11 +176,12 @@ enum cmd_token_type
   IPV6_PREFIX_TKN,  // IPV6 network prefixes
 
   /* plumbing types */
-  SELECTOR_TKN,     // marks beginning of selector
-  OPTION_TKN,       // marks beginning of option
-  NUL_TKN,          // dummy token
+  FORK_TKN,         // marks subgraph beginning
+  JOIN_TKN,         // marks subgraph end
   START_TKN,        // first token in line
   END_TKN,          // last token in line
+
+  SPECIAL_TKN = FORK_TKN,
 };
 
 /* Command attributes */
diff --git a/lib/command_match.c b/lib/command_match.c
index d228563240..c3eec53bbc 100644
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -459,7 +459,7 @@ command_complete (struct graph *graph,
 
 /**
  * Adds all children that are reachable by one parser hop to the given list.
- * NUL_TKN, SELECTOR_TKN, and OPTION_TKN nodes are treated as transparent.
+ * special tokens except END_TKN are treated as transparent.
  *
  * @param[in] list to add the nexthops to
  * @param[in] node to start calculating nexthops from
@@ -490,26 +490,24 @@ add_nexthops (struct list *list, struct graph_node *node,
           if (j != stackpos)
             continue;
         }
-      switch (token->type)
+      if (token->type >= SPECIAL_TKN && token->type != END_TKN)
         {
-          case OPTION_TKN:
-          case SELECTOR_TKN:
-          case NUL_TKN:
-            added += add_nexthops (list, child, stack, stackpos);
-            break;
-          default:
-            if (stack)
-              {
-                nextstack = XMALLOC (MTYPE_CMD_MATCHSTACK,
-                                     (stackpos + 1) * sizeof(struct graph_node *));
-                nextstack[0] = child;
-                memcpy(nextstack + 1, stack, stackpos * sizeof(struct graph_node *));
+          added += add_nexthops (list, child, stack, stackpos);
+        }
+      else
+        {
+          if (stack)
+            {
+              nextstack = XMALLOC (MTYPE_CMD_MATCHSTACK,
+                                   (stackpos + 1) * sizeof(struct graph_node *));
+              nextstack[0] = child;
+              memcpy(nextstack + 1, stack, stackpos * sizeof(struct graph_node *));
 
-                listnode_add (list, nextstack);
-              }
-            else
-              listnode_add (list, child);
-            added++;
+              listnode_add (list, nextstack);
+            }
+          else
+            listnode_add (list, child);
+          added++;
         }
     }
 
diff --git a/lib/command_parse.y b/lib/command_parse.y
index c920e11380..478ba0537c 100644
--- a/lib/command_parse.y
+++ b/lib/command_parse.y
@@ -274,8 +274,8 @@ placeholder_token:
 selector: '<' selector_seq_seq '>'
 {
   $$ = malloc (sizeof (struct subgraph));
-  $$->start = new_token_node (ctx, SELECTOR_TKN, NULL, NULL);
-  $$->end   = new_token_node (ctx, NUL_TKN, NULL, NULL);
+  $$->start = new_token_node (ctx, FORK_TKN, NULL, NULL);
+  $$->end   = new_token_node (ctx, JOIN_TKN, NULL, NULL);
   for (unsigned int i = 0; i < vector_active ($2->start->to); i++)
   {
     struct graph_node *sn = vector_slot ($2->start->to, i),
@@ -329,8 +329,8 @@ selector_seq_seq:
 selector: '{' selector_seq_seq '}'
 {
   $$ = malloc (sizeof (struct subgraph));
-  $$->start = new_token_node (ctx, SELECTOR_TKN, NULL, NULL);
-  $$->end   = new_token_node (ctx, NUL_TKN, NULL, NULL);
+  $$->start = new_token_node (ctx, FORK_TKN, NULL, NULL);
+  $$->end   = new_token_node (ctx, JOIN_TKN, NULL, NULL);
   graph_add_edge ($$->start, $$->end);
   for (unsigned int i = 0; i < vector_active ($2->start->to); i++)
   {
@@ -377,8 +377,8 @@ option: '[' option_token_seq ']'
 {
   // make a new option
   $$ = malloc (sizeof (struct subgraph));
-  $$->start = new_token_node (ctx, OPTION_TKN, NULL, NULL);
-  $$->end   = new_token_node (ctx, NUL_TKN, NULL, NULL);
+  $$->start = new_token_node (ctx, FORK_TKN, NULL, NULL);
+  $$->end   = new_token_node (ctx, JOIN_TKN, NULL, NULL);
   // add a path through the sequence to the end
   graph_add_edge ($$->start, $2->start);
   graph_add_edge ($2->end, $$->end);
@@ -575,8 +575,7 @@ cmp_token (struct cmd_token *first, struct cmd_token *second)
      * cases; ultimately this forks the graph, but the matcher can handle
      * this regardless
      */
-    case SELECTOR_TKN:
-    case OPTION_TKN:
+    case FORK_TKN:
       return 0;
 
     /* end nodes are always considered equal, since each node may only
@@ -584,7 +583,7 @@ cmp_token (struct cmd_token *first, struct cmd_token *second)
      */
     case START_TKN:
     case END_TKN:
-    case NUL_TKN:
+    case JOIN_TKN:
     default:
       break;
   }
diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c
index 0239ca44ac..b5ac36c41f 100644
--- a/lib/grammar_sandbox.c
+++ b/lib/grammar_sandbox.c
@@ -275,9 +275,8 @@ struct message tokennames[] = {
   item(IPV6_PREFIX_TKN),  // IPV6 network prefixes
 
   /* plumbing types */
-  item(SELECTOR_TKN),     // marks beginning of selector
-  item(OPTION_TKN),       // marks beginning of option
-  item(NUL_TKN),          // dummy token
+  item(FORK_TKN),
+  item(JOIN_TKN),
   item(START_TKN),        // first token in line
   item(END_TKN),          // last token in line
   { 0, NULL }
diff --git a/lib/grammar_sandbox.h b/lib/grammar_sandbox.h
deleted file mode 100644
index 5da0b05d09..0000000000
--- a/lib/grammar_sandbox.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _GRAMMAR_SANDBOX_H
-#define _GRAMMAR_SANDBOX_H
-
-/**
- * Houses functionality for testing shim as well as code that should go into
- * command.h and command.c during integration.
- */
-#include "memory.h"
-
-#define CMD_CR_TEXT "<cr>"
-
-void
-grammar_sandbox_init (void);
-
-/**
- * Types for tokens.
- *
- * The type determines what kind of data the token can match (in the
- * matching use case) or hold (in the argv use case).
- */
-enum cmd_token_type_t
-{
-  WORD_TKN,         // words
-  NUMBER_TKN,       // integral numbers
-  VARIABLE_TKN,     // almost anything
-  RANGE_TKN,        // integer range
-  IPV4_TKN,         // IPV4 addresses
-  IPV4_PREFIX_TKN,  // IPV4 network prefixes
-  IPV6_TKN,         // IPV6 prefixes
-  IPV6_PREFIX_TKN,  // IPV6 network prefixes
-
-  /* plumbing types */
-  SELECTOR_TKN,     // marks beginning of selector
-  OPTION_TKN,       // marks beginning of option
-  NUL_TKN,          // dummy token
-  START_TKN,        // first token in line
-  END_TKN,          // last token in line
-};
-
-/**
- * Token struct.
- */
-struct cmd_token_t
-{
-  enum cmd_token_type_t type;   // token type
-
-  char *text;                   // token text
-  char *desc;                   // token description
-
-  long long value;              // for numeric types
-  long long min, max;           // for ranges
-
-  char *arg;                    // user input that matches this token
-};
-
-#endif /* _GRAMMAR_SANDBOX_H */
diff --git a/tools/permutations.c b/tools/permutations.c
index 8db51ee037..0ca980b259 100644
--- a/tools/permutations.c
+++ b/tools/permutations.c
@@ -70,7 +70,7 @@ permute (struct graph_node *start)
       for (ALL_LIST_ELEMENTS_RO (position,ln,gnn))
       {
         struct cmd_token *tt = gnn->data;
-        if (tt->type < SELECTOR_TKN)
+        if (tt->type < SPECIAL_TKN)
           fprintf (stdout, "%s ", tt->text);
       }
       fprintf (stdout, "\n");