diff --git a/impls/basic/step2_eval.in.bas b/impls/basic/step2_eval.in.bas
index 38dec57333..f3501d1bfa 100755
--- a/impls/basic/step2_eval.in.bas
+++ b/impls/basic/step2_eval.in.bas
@@ -19,21 +19,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    H=E:B$=S$(Z%(A+1)):GOSUB HASHMAP_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -94,9 +81,23 @@ SUB EVAL
   REM AZ=A:B=1:GOSUB PR_STR
   REM PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    H=E:B$=S$(Z%(A+1)):GOSUB HASHMAP_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/step3_env.in.bas b/impls/basic/step3_env.in.bas
index c247825725..ee6193dc91 100755
--- a/impls/basic/step3_env.in.bas
+++ b/impls/basic/step3_env.in.bas
@@ -20,21 +20,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -98,9 +85,23 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/step4_if_fn_do.in.bas b/impls/basic/step4_if_fn_do.in.bas
index 6061890413..eb1e229493 100755
--- a/impls/basic/step4_if_fn_do.in.bas
+++ b/impls/basic/step4_if_fn_do.in.bas
@@ -21,21 +21,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -101,9 +88,23 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/step5_tco.in.bas b/impls/basic/step5_tco.in.bas
index e2fc26f0e1..ad7410c763 100755
--- a/impls/basic/step5_tco.in.bas
+++ b/impls/basic/step5_tco.in.bas
@@ -21,21 +21,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -107,9 +94,23 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/step6_file.in.bas b/impls/basic/step6_file.in.bas
index 4d7a96d3c7..800cec84e5 100755
--- a/impls/basic/step6_file.in.bas
+++ b/impls/basic/step6_file.in.bas
@@ -21,21 +21,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -107,9 +94,23 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/step7_quote.in.bas b/impls/basic/step7_quote.in.bas
index 708e5e50e5..b1f60fce9e 100755
--- a/impls/basic/step7_quote.in.bas
+++ b/impls/basic/step7_quote.in.bas
@@ -132,21 +132,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -218,9 +205,23 @@ SUB EVAL
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/step8_macros.in.bas b/impls/basic/step8_macros.in.bas
index 99667ed211..7c26b3bd13 100755
--- a/impls/basic/step8_macros.in.bas
+++ b/impls/basic/step8_macros.in.bas
@@ -167,21 +167,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -247,16 +234,31 @@ SUB EVAL
 
   IF ER<>-2 THEN GOTO EVAL_RETURN
 
+  EVAL_NOT_LIST:
+
   B$="DEBUG-EVAL":CALL ENV_GET
   IF R3=0 OR R=0 OR R=2 THEN GOTO DEBUG_EVAL_DONE
     AZ=A:B=1:GOSUB PR_STR
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
-  EVAL_NOT_LIST:
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/step9_try.in.bas b/impls/basic/step9_try.in.bas
index ecc50203c4..b7e3dc3169 100755
--- a/impls/basic/step9_try.in.bas
+++ b/impls/basic/step9_try.in.bas
@@ -167,21 +167,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -247,16 +234,31 @@ SUB EVAL
 
   IF ER<>-2 THEN GOTO EVAL_RETURN
 
+  EVAL_NOT_LIST:
+
   B$="DEBUG-EVAL":CALL ENV_GET
   IF R3=0 OR R=0 OR R=2 THEN GOTO DEBUG_EVAL_DONE
     AZ=A:B=1:GOSUB PR_STR
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
-  EVAL_NOT_LIST:
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN
 
diff --git a/impls/basic/stepA_mal.in.bas b/impls/basic/stepA_mal.in.bas
index 1aaf1305d8..8c877635ac 100755
--- a/impls/basic/stepA_mal.in.bas
+++ b/impls/basic/stepA_mal.in.bas
@@ -167,21 +167,8 @@ SUB EVAL_AST
   IF ER<>-2 THEN GOTO EVAL_AST_RETURN
 
   GOSUB TYPE_A
-  IF T=5 THEN GOTO EVAL_AST_SYMBOL
-  IF T>5 AND T<9 THEN GOTO EVAL_AST_SEQ
+  IF T<6 OR 8<T THEN R=-1:ER=-1:E$="EVAL_AST: bad type":GOTO EVAL_AST_RETURN
 
-  REM scalar: deref to actual value and inc ref cnt
-  R=A
-  GOSUB INC_REF_R
-  GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SYMBOL:
-    B$=S$(Z%(A+1)):CALL ENV_GET
-    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_AST_RETURN
-    GOSUB INC_REF_R
-    GOTO EVAL_AST_RETURN
-
-  EVAL_AST_SEQ:
     REM setup the stack for the loop
     GOSUB MAP_LOOP_START
 
@@ -247,16 +234,31 @@ SUB EVAL
 
   IF ER<>-2 THEN GOTO EVAL_RETURN
 
+  EVAL_NOT_LIST:
+
   B$="DEBUG-EVAL":CALL ENV_GET
   IF R3=0 OR R=0 OR R=2 THEN GOTO DEBUG_EVAL_DONE
     AZ=A:B=1:GOSUB PR_STR
     PRINT "EVAL: "+R$+" [A:"+STR$(A)+", LV:"+STR$(LV)+"]"
   DEBUG_EVAL_DONE:
 
-  GOSUB LIST_Q
-  IF R THEN GOTO APPLY_LIST
-  EVAL_NOT_LIST:
+  GOSUB TYPE_A
+  T=T-4
+  IF 0<T THEN ON T GOTO EVAL_SYMBOL,APPLY_LIST,EVAL_VECTOR,EVAL_MAP
+
   REM ELSE
+    R=A
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_SYMBOL:
+    B$=S$(Z%(A+1)):CALL ENV_GET
+    IF R3=0 THEN R=-1:ER=-1:E$="'"+B$+"' not found":GOTO EVAL_RETURN
+    GOSUB INC_REF_R
+    GOTO EVAL_RETURN
+
+  EVAL_MAP:
+  EVAL_VECTOR:
     CALL EVAL_AST
     GOTO EVAL_RETURN