* interp/nruncomp.boot (NRTputInHead): Tidy.

9 files changed, 81 insertions, 103 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3426f56a..2a257a72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-27  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/nruncomp.boot (NRTputInHead): Tidy.
+
 2011-01-26  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* interp/g-util.boot (expandListlit): Tidy.
diff --git a/src/algebra/strap/GCDDOM-.lsp b/src/algebra/strap/GCDDOM-.lsp
index 36dbbf51..b8e1a81d 100644
--- a/src/algebra/strap/GCDDOM-.lsp
+++ b/src/algebra/strap/GCDDOM-.lsp
@@ -60,7 +60,7 @@
                                       (|getShellEntry| $ 27))))
                              (|check-union| (ZEROP (CAR #0#))
                                  (|SparseUnivariatePolynomial|
-                                     (|getShellEntry| $ 6))
+                                     (SVREF $ 6))
                                  #0#)
                              (CDR #0#)))
                      (SETQ |p2|
@@ -68,7 +68,7 @@
                                        (|getShellEntry| $ 27))))
                              (|check-union| (ZEROP (CAR #0#))
                                  (|SparseUnivariatePolynomial|
-                                     (|getShellEntry| $ 6))
+                                     (SVREF $ 6))
                                  #0#)
                              (CDR #0#)))
                      (SEQ (LETT |e1|
@@ -85,7 +85,7 @@
                                         (|getShellEntry| $ 35))))
                                       (|check-union| (ZEROP (CAR #0#))
                                        (|SparseUnivariatePolynomial|
-                                        (|getShellEntry| $ 6))
+                                        (SVREF $ 6))
                                        #0#)
                                       (CDR #0#)))))))
                      (SEQ (LETT |e2|
@@ -102,7 +102,7 @@
                                         (|getShellEntry| $ 35))))
                                       (|check-union| (ZEROP (CAR #0#))
                                        (|SparseUnivariatePolynomial|
-                                        (|getShellEntry| $ 6))
+                                        (SVREF $ 6))
                                        #0#)
                                       (CDR #0#)))))))
                      (LETT |e1| (MIN |e1| |e2|)
@@ -154,7 +154,7 @@
                                                 (|check-union|
                                                  (ZEROP (CAR #0#))
                                                  (|SparseUnivariatePolynomial|
-                                                  (|getShellEntry| $ 6))
+                                                  (SVREF $ 6))
                                                  #0#)
                                                 (CDR #0#))
                                               (|getShellEntry| $ 42))
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index 0d8a5c40..666f6015 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -181,7 +181,7 @@
   (DECLARE (IGNORE $))
   (REVERSE |x|)) 
 
-(DEFUN |ILIST;minIndex;$I;18| (|x| $) (|getShellEntry| $ 7)) 
+(DEFUN |ILIST;minIndex;$I;18| (|x| $) (SVREF $ 7)) 
 
 (DEFUN |ILIST;rest;$Nni$;19| (|x| |n| $)
   (SEQ (LET ((|i| 1))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 815d47c7..59373d55 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -163,7 +163,7 @@
 
 (DEFUN |ISTRING;insert;2$I$;9| (|s| |t| |i| $)
   (STRCONC (STRCONC (|ISTRING;elt;$Us$;31| |s|
-                        (SPADCALL (|getShellEntry| $ 6) (- |i| 1)
+                        (SPADCALL (SVREF $ 6) (- |i| 1)
                             (|getShellEntry| $ 24))
                         $)
                     |t|)
@@ -173,7 +173,7 @@
 (DEFUN |ISTRING;coerce;$Of;10| (|s| $)
   (SPADCALL |s| (|getShellEntry| $ 30))) 
 
-(DEFUN |ISTRING;minIndex;$I;11| (|s| $) (|getShellEntry| $ 6)) 
+(DEFUN |ISTRING;minIndex;$I;11| (|s| $) (SVREF $ 6)) 
 
 (DEFUN |ISTRING;upperCase!;2$;12| (|s| $)
   (SPADCALL (ELT $ 35) |s| (|getShellEntry| $ 37))) 
@@ -188,15 +188,14 @@
 (DEFUN |ISTRING;replace;$Us2$;15| (|s| |sg| |t| $)
   (PROG (|r| |k|)
     (RETURN
-      (LET ((|l| (- (SPADCALL |sg| (|getShellEntry| $ 44))
-                    (|getShellEntry| $ 6)))
+      (LET ((|l| (- (SPADCALL |sg| (|getShellEntry| $ 44)) (SVREF $ 6)))
             (|m| (LENGTH |s|)) (|n| (LENGTH |t|))
             (|h| (COND
                    ((SPADCALL |sg| (|getShellEntry| $ 45))
                     (- (SPADCALL |sg| (|getShellEntry| $ 46))
-                       (|getShellEntry| $ 6)))
+                       (SVREF $ 6)))
                    (T (- (SPADCALL |s| (|getShellEntry| $ 47))
-                         (|getShellEntry| $ 6))))))
+                         (SVREF $ 6))))))
         (SEQ (COND
                ((OR (OR (MINUSP |l|) (NOT (< |h| |m|)))
                     (< |h| (- |l| 1)))
@@ -235,15 +234,14 @@
 
 (DEFUN |ISTRING;setelt;$I2C;16| (|s| |i| |c| $)
   (SEQ (COND
-         ((OR (< |i| (|getShellEntry| $ 6))
+         ((OR (< |i| (SVREF $ 6))
               (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|))
           (|error| "index out of range"))
-         (T (SEQ (SETF (CHAR |s| (- |i| (|getShellEntry| $ 6))) |c|)
-                 (EXIT |c|)))))) 
+         (T (SEQ (SETF (CHAR |s| (- |i| (SVREF $ 6))) |c|) (EXIT |c|)))))) 
 
 (DEFUN |ISTRING;substring?;2$IB;17| (|part| |whole| |startpos| $)
   (LET ((|np| (LENGTH |part|)) (|nw| (LENGTH |whole|)))
-    (SEQ (SETQ |startpos| (- |startpos| (|getShellEntry| $ 6)))
+    (SEQ (SETQ |startpos| (- |startpos| (SVREF $ 6)))
          (EXIT (COND
                  ((MINUSP |startpos|) (|error| "index out of bounds"))
                  ((< (- |nw| |startpos|) |np|) NIL)
@@ -266,25 +264,23 @@
 (DEFUN |ISTRING;position;2$2I;18| (|s| |t| |startpos| $)
   (PROG (|r|)
     (RETURN
-      (SEQ (SETQ |startpos| (- |startpos| (|getShellEntry| $ 6)))
+      (SEQ (SETQ |startpos| (- |startpos| (SVREF $ 6)))
            (EXIT (COND
                    ((MINUSP |startpos|)
                     (|error| "index out of bounds"))
                    ((NOT (< |startpos| (LENGTH |t|)))
-                    (- (|getShellEntry| $ 6) 1))
+                    (- (SVREF $ 6) 1))
                    (T (SEQ (LETT |r| (STRPOS |s| |t| |startpos| NIL)
                                  |ISTRING;position;2$2I;18|)
                            (EXIT (COND
-                                   ((EQ |r| NIL)
-                                    (- (|getShellEntry| $ 6) 1))
-                                   (T (+ |r| (|getShellEntry| $ 6))))))))))))) 
+                                   ((EQ |r| NIL) (- (SVREF $ 6) 1))
+                                   (T (+ |r| (SVREF $ 6))))))))))))) 
 
 (DEFUN |ISTRING;position;C$2I;19| (|c| |t| |startpos| $)
-  (SEQ (SETQ |startpos| (- |startpos| (|getShellEntry| $ 6)))
+  (SEQ (SETQ |startpos| (- |startpos| (SVREF $ 6)))
        (EXIT (COND
                ((MINUSP |startpos|) (|error| "index out of bounds"))
-               ((NOT (< |startpos| (LENGTH |t|)))
-                (- (|getShellEntry| $ 6) 1))
+               ((NOT (< |startpos| (LENGTH |t|))) (- (SVREF $ 6) 1))
                (T (SEQ (LET ((|r| |startpos|)
                              (#0=#:G1514 (- (LENGTH |t|) 1)))
                          (LOOP
@@ -294,16 +290,15 @@
                                   ((CHAR= (CHAR |t| |r|) |c|)
                                    (RETURN-FROM
                                     |ISTRING;position;C$2I;19|
-                                     (+ |r| (|getShellEntry| $ 6)))))))
+                                     (+ |r| (SVREF $ 6)))))))
                            (SETQ |r| (+ |r| 1))))
-                       (EXIT (- (|getShellEntry| $ 6) 1)))))))) 
+                       (EXIT (- (SVREF $ 6) 1)))))))) 
 
 (DEFUN |ISTRING;position;Cc$2I;20| (|cc| |t| |startpos| $)
-  (SEQ (SETQ |startpos| (- |startpos| (|getShellEntry| $ 6)))
+  (SEQ (SETQ |startpos| (- |startpos| (SVREF $ 6)))
        (EXIT (COND
                ((MINUSP |startpos|) (|error| "index out of bounds"))
-               ((NOT (< |startpos| (LENGTH |t|)))
-                (- (|getShellEntry| $ 6) 1))
+               ((NOT (< |startpos| (LENGTH |t|))) (- (SVREF $ 6) 1))
                (T (SEQ (LET ((|r| |startpos|)
                              (#0=#:G1515 (- (LENGTH |t|) 1)))
                          (LOOP
@@ -314,9 +309,9 @@
                                     (|getShellEntry| $ 65))
                                    (RETURN-FROM
                                     |ISTRING;position;Cc$2I;20|
-                                     (+ |r| (|getShellEntry| $ 6)))))))
+                                     (+ |r| (SVREF $ 6)))))))
                            (SETQ |r| (+ |r| 1))))
-                       (EXIT (- (|getShellEntry| $ 6) 1)))))))) 
+                       (EXIT (- (SVREF $ 6) 1)))))))) 
 
 (DEFUN |ISTRING;suffix?;2$B;21| (|s| |t| $)
   (LET ((|m| (SPADCALL |s| (|getShellEntry| $ 47)))
@@ -324,13 +319,13 @@
     (COND
       ((< |n| |m|) NIL)
       (T (|ISTRING;substring?;2$IB;17| |s| |t|
-             (- (+ (|getShellEntry| $ 6) |n|) |m|) $))))) 
+             (- (+ (SVREF $ 6) |n|) |m|) $))))) 
 
 (DEFUN |ISTRING;split;$CL;22| (|s| |c| $)
   (PROG (|l| |j|)
     (RETURN
       (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47)))
-            (|i| (|getShellEntry| $ 6)))
+            (|i| (SVREF $ 6)))
         (SEQ (LOOP
                (COND
                  ((NOT (COND
@@ -348,15 +343,14 @@
                                      (|ISTRING;position;C$2I;19| |c|
                                       |s| |i| $)
                                      |ISTRING;split;$CL;22|)
-                                    (|getShellEntry| $ 6))))))
+                                    (SVREF $ 6))))))
                   (RETURN NIL))
                  (T (SEQ (SETQ |l|
-                               (SPADCALL
-                                   (|ISTRING;elt;$Us$;31| |s|
-                                    (SPADCALL |i| (- |j| 1)
-                                     (|getShellEntry| $ 24))
-                                    $)
-                                   |l| (|getShellEntry| $ 72)))
+                               (SPADCALL (|ISTRING;elt;$Us$;31| |s|
+                                          (SPADCALL |i| (- |j| 1)
+                                           (|getShellEntry| $ 24))
+                                          $)
+                                         |l| (|getShellEntry| $ 72)))
                          (SETQ |i| |j|)
                          (EXIT (LOOP
                                  (COND
@@ -384,7 +378,7 @@
   (PROG (|l| |j|)
     (RETURN
       (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47)))
-            (|i| (|getShellEntry| $ 6)))
+            (|i| (SVREF $ 6)))
         (SEQ (LOOP
                (COND
                  ((NOT (COND
@@ -402,7 +396,7 @@
                                      (|ISTRING;position;Cc$2I;20| |cc|
                                       |s| |i| $)
                                      |ISTRING;split;$CcL;23|)
-                                    (|getShellEntry| $ 6))))))
+                                    (SVREF $ 6))))))
                   (RETURN NIL))
                  (T (SEQ (SETQ |l|
                                (SPADCALL
@@ -435,8 +429,7 @@
              (EXIT (NREVERSE |l|))))))) 
 
 (DEFUN |ISTRING;leftTrim;$C$;24| (|s| |c| $)
-  (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47)))
-        (|i| (|getShellEntry| $ 6)))
+  (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47))) (|i| (SVREF $ 6)))
     (SEQ (LOOP
            (COND
              ((NOT (COND
@@ -449,8 +442,7 @@
                    (SPADCALL |i| |n| (|getShellEntry| $ 24)) $))))) 
 
 (DEFUN |ISTRING;leftTrim;$Cc$;25| (|s| |cc| $)
-  (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47)))
-        (|i| (|getShellEntry| $ 6)))
+  (LET ((|n| (SPADCALL |s| (|getShellEntry| $ 47))) (|i| (SVREF $ 6)))
     (SEQ (LOOP
            (COND
              ((NOT (COND
@@ -467,7 +459,7 @@
     (SEQ (LOOP
            (COND
              ((NOT (COND
-                     ((NOT (< |j| (|getShellEntry| $ 6)))
+                     ((NOT (< |j| (SVREF $ 6)))
                       (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) |c|
                           (|getShellEntry| $ 69)))
                      (T NIL)))
@@ -483,7 +475,7 @@
     (SEQ (LOOP
            (COND
              ((NOT (COND
-                     ((NOT (< |j| (|getShellEntry| $ 6)))
+                     ((NOT (< |j| (SVREF $ 6)))
                       (SPADCALL (|ISTRING;elt;$IC;30| |s| |j| $) |cc|
                           (|getShellEntry| $ 65)))
                      (T NIL)))
@@ -511,7 +503,7 @@
                               (SETQ #1# NIL)))))
                      (SETQ #2# (CDR #2#))))
                  (|spadConstant| $ 53) (|getShellEntry| $ 9)))
-        (|i| (|getShellEntry| $ 6)))
+        (|i| (SVREF $ 6)))
     (SEQ (LET ((#4=#:G1516 |l|))
            (LOOP
              (COND
@@ -524,7 +516,7 @@
 
 (DEFUN |ISTRING;copyInto!;2$I$;29| (|y| |x| |s| $)
   (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 16))) (|n| (LENGTH |y|)))
-    (SEQ (SETQ |s| (- |s| (|getShellEntry| $ 6)))
+    (SEQ (SETQ |s| (- |s| (SVREF $ 6)))
          (COND
            ((OR (MINUSP |s|) (< |n| (+ |s| |m|)))
             (EXIT (|error| "index out of range"))))
@@ -532,20 +524,17 @@
 
 (DEFUN |ISTRING;elt;$IC;30| (|s| |i| $)
   (COND
-    ((OR (< |i| (|getShellEntry| $ 6))
+    ((OR (< |i| (SVREF $ 6))
          (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|))
      (|error| "index out of range"))
-    (T (CHAR |s| (- |i| (|getShellEntry| $ 6)))))) 
+    (T (CHAR |s| (- |i| (SVREF $ 6)))))) 
 
 (DEFUN |ISTRING;elt;$Us$;31| (|s| |sg| $)
-  (LET ((|l| (- (SPADCALL |sg| (|getShellEntry| $ 44))
-                (|getShellEntry| $ 6)))
+  (LET ((|l| (- (SPADCALL |sg| (|getShellEntry| $ 44)) (SVREF $ 6)))
         (|h| (COND
                ((SPADCALL |sg| (|getShellEntry| $ 45))
-                (- (SPADCALL |sg| (|getShellEntry| $ 46))
-                   (|getShellEntry| $ 6)))
-               (T (- (SPADCALL |s| (|getShellEntry| $ 47))
-                     (|getShellEntry| $ 6))))))
+                (- (SPADCALL |sg| (|getShellEntry| $ 46)) (SVREF $ 6)))
+               (T (- (SPADCALL |s| (|getShellEntry| $ 47)) (SVREF $ 6))))))
     (SEQ (COND
            ((OR (MINUSP |l|) (NOT (< |h| (LENGTH |s|))))
             (EXIT (|error| "index out of bound"))))
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 4fe691d8..8916bd73 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -546,7 +546,7 @@
             (|%listlit| 'INTSIGN |b| (|%listlit| 'NOTHING) |a|))) 
 
 (DEFUN |OUTFORM;doubleFloatFormat;2S;1| (|s| $)
-  (LET ((|ss| (|getShellEntry| $ 6)))
+  (LET ((|ss| (SVREF $ 6)))
     (SEQ (|setShellEntry| $ 6 |s|) (EXIT |ss|)))) 
 
 (DEFUN |OUTFORM;sform| (|s| $) (DECLARE (IGNORE $)) |s|) 
diff --git a/src/algebra/strap/POLYCAT-.lsp b/src/algebra/strap/POLYCAT-.lsp
index 9ad42dc5..a02ca0c4 100644
--- a/src/algebra/strap/POLYCAT-.lsp
+++ b/src/algebra/strap/POLYCAT-.lsp
@@ -306,8 +306,7 @@
 
 (DEFUN |POLYCAT-;retract;SVarSet;9| (|p| $)
   (LET ((|q| (LET ((#0=#:G1453 (SPADCALL |p| (|getShellEntry| $ 53))))
-               (|check-union| (ZEROP (CAR #0#)) (|getShellEntry| $ 9)
-                   #0#)
+               (|check-union| (ZEROP (CAR #0#)) (SVREF $ 9) #0#)
                (CDR #0#))))
     (COND
       ((SPADCALL (SPADCALL |q| (|getShellEntry| $ 72)) |p|
@@ -360,7 +359,7 @@
                                       (SPADCALL |p|
                                        (|getShellEntry| $ 53))))
                                  (|check-union| (ZEROP (CAR #0#))
-                                     (|getShellEntry| $ 9) #0#)
+                                     (SVREF $ 9) #0#)
                                  (CDR #0#))
                                (|getShellEntry| $ 59))
                            |POLYCAT-;totalDegree;SNni;13|)
@@ -397,7 +396,7 @@
                                         (SPADCALL |p|
                                          (|getShellEntry| $ 53))))
                                        (|check-union| (ZEROP (CAR #0#))
-                                        (|getShellEntry| $ 9) #0#)
+                                        (SVREF $ 9) #0#)
                                        (CDR #0#))
                                      |POLYCAT-;totalDegree;SLNni;14|)
                                (|getShellEntry| $ 59))
@@ -1041,8 +1040,7 @@
                        (SPADCALL |p|
                            (SPADCALL |p| (|getShellEntry| $ 206))
                            (|getShellEntry| $ 207))))
-               (|check-union| (ZEROP (CAR #0#)) (|getShellEntry| $ 6)
-                   #0#)
+               (|check-union| (ZEROP (CAR #0#)) (SVREF $ 6) #0#)
                (CDR #0#))
              (|getShellEntry| $ 209))
          1)) 
@@ -1053,8 +1051,7 @@
                        (SPADCALL |p|
                            (SPADCALL |p| |v| (|getShellEntry| $ 211))
                            (|getShellEntry| $ 212))))
-               (|check-union| (ZEROP (CAR #0#)) (|getShellEntry| $ 6)
-                   #0#)
+               (|check-union| (ZEROP (CAR #0#)) (SVREF $ 6) #0#)
                (CDR #0#))
              (|getShellEntry| $ 209))
          1)) 
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index 23ee4bcf..4f8af7d9 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -499,8 +499,8 @@
 
 (DEFUN |SINT;random;$;60| ($)
   (SEQ (|setShellEntry| $ 6
-           (REM (TIMES 314159269 (|getShellEntry| $ 6)) 2147483647))
-       (EXIT (REM (|getShellEntry| $ 6) 67108864)))) 
+           (REM (TIMES 314159269 (SVREF $ 6)) 2147483647))
+       (EXIT (REM (SVREF $ 6) 67108864)))) 
 
 (DEFUN |SINT;random;2$;61| (|n| $) (DECLARE (IGNORE $)) (RANDOM |n|)) 
 
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 2398b1e7..72bde704 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -208,7 +208,7 @@
               (RETURN NIL))
              (T (SETQ |ns| (CDR |ns|)))))
          (EXIT (SPADCALL
-                   (CONS (STRCONC (|getShellEntry| $ 38)
+                   (CONS (STRCONC (SVREF $ 38)
                                   (|SYMBOL;istring|
                                       (LIST-LENGTH (SVREF |sc| 4)) $))
                          (LET ((#0=#:G1524 (NREVERSE |ns|))
@@ -409,13 +409,10 @@
 
 (DEFUN |SYMBOL;new;$;27| ($)
   (LET ((|sym| (|SYMBOL;anyRadix|
-                   (SPADCALL (|getShellEntry| $ 10)
-                       (|getShellEntry| $ 120))
-                   (|getShellEntry| $ 20) $)))
-    (SEQ (SPADCALL (|getShellEntry| $ 10)
-             (+ (SPADCALL (|getShellEntry| $ 10)
-                    (|getShellEntry| $ 120))
-                1)
+                   (SPADCALL (SVREF $ 10) (|getShellEntry| $ 120))
+                   (SVREF $ 20) $)))
+    (SEQ (SPADCALL (SVREF $ 10)
+             (+ (SPADCALL (SVREF $ 10) (|getShellEntry| $ 120)) 1)
              (|getShellEntry| $ 121))
          (EXIT (|SYMBOL;coerce;S$;8| (STRCONC "%" |sym|) $))))) 
 
@@ -424,15 +421,14 @@
     (RETURN
       (SEQ (LETT |n|
                  (SEQ (LETT |u|
-                            (SPADCALL |x| (|getShellEntry| $ 13)
+                            (SPADCALL |x| (SVREF $ 13)
                                 (|getShellEntry| $ 124))
                             |SYMBOL;new;2$;28|)
                       (EXIT (COND
                               ((EQL (CAR |u|) 1) 0)
                               (T (+ (CDR |u|) 1)))))
                  |SYMBOL;new;2$;28|)
-           (SPADCALL (|getShellEntry| $ 13) |x| |n|
-               (|getShellEntry| $ 127))
+           (SPADCALL (SVREF $ 13) |x| |n| (|getShellEntry| $ 127))
            (LETT |xx|
                  (COND
                    ((NOT (|SYMBOL;scripted?;$B;30| |x| $))
@@ -448,16 +444,13 @@
                                     (SPADCALL |xx|
                                      (|getShellEntry| $ 128))
                                     (|getShellEntry| $ 106))
-                                (|getShellEntry| $ 19)
-                                (|getShellEntry| $ 129))
-                            (SPADCALL (|getShellEntry| $ 19)
+                                (SVREF $ 19) (|getShellEntry| $ 129))
+                            (SPADCALL (SVREF $ 19)
                                 (|getShellEntry| $ 117))))
                     (STRCONC |xx|
-                             (|SYMBOL;anyRadix| |n|
-                                 (|getShellEntry| $ 21) $)))
+                             (|SYMBOL;anyRadix| |n| (SVREF $ 21) $)))
                    (T (STRCONC |xx|
-                               (|SYMBOL;anyRadix| |n|
-                                   (|getShellEntry| $ 19) $)))))
+                               (|SYMBOL;anyRadix| |n| (SVREF $ 19) $)))))
            (COND
              ((NOT (|SYMBOL;scripted?;$B;30| |x| $))
               (EXIT (|SYMBOL;coerce;S$;8| |xx| $))))
@@ -465,15 +458,14 @@
                      (|SYMBOL;scripts;$R;32| |x| $) $)))))) 
 
 (DEFUN |SYMBOL;resetNew;V;29| ($)
-  (SEQ (SPADCALL (|getShellEntry| $ 10) 0 (|getShellEntry| $ 121))
+  (SEQ (SPADCALL (SVREF $ 10) 0 (|getShellEntry| $ 121))
        (EXIT (LET ((#0=#:G1525
-                       (SPADCALL (|getShellEntry| $ 13)
-                           (|getShellEntry| $ 133))))
+                       (SPADCALL (SVREF $ 13) (|getShellEntry| $ 133))))
                (LOOP
                  (COND
                    ((ATOM #0#) (RETURN NIL))
                    (T (LET ((|k| (CAR #0#)))
-                        (SPADCALL |k| (|getShellEntry| $ 13)
+                        (SPADCALL |k| (SVREF $ 13)
                             (|getShellEntry| $ 134)))))
                  (SETQ #0# (CDR #0#))))))) 
 
@@ -490,7 +482,7 @@
                                    (|getShellEntry| $ 137))
                                $)
                            |SYMBOL;name;2$;31|)
-                     (LET ((|i| (+ (|getShellEntry| $ 41) 1))
+                     (LET ((|i| (+ (SVREF $ 41) 1))
                            (#0=#:G1526 (LENGTH |str|)))
                        (LOOP
                          (COND
@@ -532,8 +524,7 @@
                            (SPADCALL |nscripts|
                                (|getShellEntry| $ 144))
                            |SYMBOL;scripts;$R;32|)
-                     (LET ((|i| |m|)
-                           (|j| (+ (|getShellEntry| $ 41) 1)))
+                     (LET ((|i| |m|) (|j| (+ (SVREF $ 41) 1)))
                        (LOOP
                          (COND
                            ((OR (> |j| |nstr|)
@@ -549,7 +540,7 @@
                                            (SPADCALL |str| |j|
                                             (|getShellEntry| $ 106))
                                            (|getShellEntry| $ 44))
-                                          (|getShellEntry| $ 45))))
+                                          (SVREF $ 45))))
                                     (|check-subtype| (NOT (MINUSP #0#))
                                      '(|NonNegativeInteger|) #0#))
                                   (|getShellEntry| $ 148))))
@@ -614,7 +605,7 @@
 (DEFUN |SYMBOL;istring| (|n| $)
   (COND
     ((< 9 |n|) (|error| "Can have at most 9 scripts of each kind"))
-    (T (|getSimpleArrayEntry| (|getShellEntry| $ 18) |n|)))) 
+    (T (|getSimpleArrayEntry| (SVREF $ 18) |n|)))) 
 
 (DEFUN |SYMBOL;list;$L;34| (|sy| $)
   (COND
@@ -654,7 +645,7 @@
     (|setShellEntry| $ 20 "ABCDEFGHIJKLMNOPQRSTUVWXYZ")
     (|setShellEntry| $ 21 "abcdefghijklmnopqrstuvwxyz")
     (|setShellEntry| $ 38 "*")
-    (|setShellEntry| $ 41 (LENGTH (|getShellEntry| $ 38)))
+    (|setShellEntry| $ 41 (LENGTH (SVREF $ 38)))
     (|setShellEntry| $ 45
         (SPADCALL (SPADCALL "0" (|getShellEntry| $ 43))
             (|getShellEntry| $ 44)))
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 2d2a0184..6734e132 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -689,8 +689,8 @@ NRTputInHead bod ==
   bod is ['SPADCALL,:args,fn] =>
     NRTputInTail rest bod --NOTE: args = COPY of rest bod
     -- The following test allows function-returning expressions
-    fn is [elt,dom,ind] and not (dom='$) and elt in '(getShellEntry ELT QREFELT CONST) =>
-      k:= NRTassocIndex dom => lastNode(bod).first := [$elt,'_$,k]
+    fn is [elt,dom,ind] and dom ~='$ and elt in '(getShellEntry ELT QREFELT CONST) =>
+      k := NRTassocIndex dom => lastNode(bod).first := ['%vref,'_$,k]
       nil
     NRTputInHead fn
     bod
@@ -699,9 +699,6 @@ NRTputInHead bod ==
     bod
   bod is ["QUOTE",:.] => bod
   bod is ["CLOSEDFN",:.] => bod
-  bod is ["SPADCONST",dom,ind] =>
-    keyedSystemError("S2GE0016",['"NRTputInHead",
-       '"unexpected SPADCONST form"])
   NRTputInHead first bod
   NRTputInTail rest bod
   bod
@@ -711,7 +708,7 @@ NRTputInTail x ==
     atom (u := first y) =>
       u='$ or LASSOC(u,$devaluateList) => nil
       k:= NRTassocIndex u =>
-        atom u => y.first := [$elt,'_$,k]
+        atom u => y.first := ['%vref,'_$,k]
         -- u atomic means that the slot will always contain a vector
         y.first := ['SPADCHECKELT,'_$,k]
       --this reference must check that slot is a vector