* interp/i-map.boot (addMap): Fix typo from last commit.

	* interp/compiler.boot (compElt): Fix thinko, one more time.
	* interp/nruncomp.boot (optDeltaEntry): Don't overquote VM forms
	for constants.
	* algebra/algext.spad.pamphlet: Call niladic functions with empty
	argument lists.
	* algebra/ddfact.spad.pamphlet: Likewise.
	* algebra/gpgcd.spad.pamphlet: Likewise.
	* algebra/modmon.spad.pamphlet: Likewise.
	* algebra/pf.spad.pamphlet: Likewise.
	* algebra/polycat.spad.pamphlet: Likewise.
	* algebra/twofact.spad.pamphlet: Likewise.
	* algebra/list.spad.pamphlet: "nil" is now a ocnstant.
	* algebra/string.spad.pamphlet: "space", "quote", "escape" are now
	constants. 

16 files changed, 103 insertions, 101 deletions

diff --git a/src/algebra/strap/BOOLEAN.lsp b/src/algebra/strap/BOOLEAN.lsp
index d672850f..61b9fc33 100644
--- a/src/algebra/strap/BOOLEAN.lsp
+++ b/src/algebra/strap/BOOLEAN.lsp
@@ -94,7 +94,7 @@
 
 (DEFUN |BOOLEAN;not;2$;4| (|b| $) (DECLARE (IGNORE $)) (NOT |b|)) 
 
-(DEFUN |BOOLEAN;~;2$;5| (|b| $) (COND (|b| 'NIL) ('T 'T))) 
+(DEFUN |BOOLEAN;~;2$;5| (|b| $) (COND (|b| NIL) ('T T))) 
 
 (DEFUN |BOOLEAN;and;3$;6| (|a| |b| $)
   (DECLARE (IGNORE $))
@@ -116,32 +116,31 @@
   (COND (|a| (NOT |b|)) ('T |b|))) 
 
 (DEFUN |BOOLEAN;nor;3$;11| (|a| |b| $)
-  (COND (|a| 'NIL) ('T (NOT |b|)))) 
+  (COND (|a| NIL) ('T (NOT |b|)))) 
 
-(DEFUN |BOOLEAN;nand;3$;12| (|a| |b| $)
-  (COND (|a| (NOT |b|)) ('T 'T))) 
+(DEFUN |BOOLEAN;nand;3$;12| (|a| |b| $) (COND (|a| (NOT |b|)) ('T T))) 
 
 (DEFUN |BOOLEAN;=;3$;13| (|a| |b| $)
   (DECLARE (IGNORE $))
   (EQ |a| |b|)) 
 
-(DEFUN |BOOLEAN;implies;3$;14| (|a| |b| $) (COND (|a| |b|) ('T 'T))) 
+(DEFUN |BOOLEAN;implies;3$;14| (|a| |b| $) (COND (|a| |b|) ('T T))) 
 
 (DEFUN |BOOLEAN;equiv;3$;15| (|a| |b| $)
   (DECLARE (IGNORE $))
   (EQ |a| |b|)) 
 
-(DEFUN |BOOLEAN;<;3$;16| (|a| |b| $) (COND (|b| (NOT |a|)) ('T 'NIL))) 
+(DEFUN |BOOLEAN;<;3$;16| (|a| |b| $) (COND (|b| (NOT |a|)) ('T NIL))) 
 
 (DEFUN |BOOLEAN;size;Nni;17| ($) (DECLARE (IGNORE $)) 2) 
 
 (DEFUN |BOOLEAN;index;Pi$;18| (|i| $)
-  (COND ((SPADCALL |i| (|getShellEntry| $ 28)) 'NIL) ('T 'T))) 
+  (COND ((SPADCALL |i| (|getShellEntry| $ 28)) NIL) ('T T))) 
 
 (DEFUN |BOOLEAN;lookup;$Pi;19| (|a| $) (COND (|a| 1) ('T 2))) 
 
 (DEFUN |BOOLEAN;random;$;20| ($)
-  (COND ((SPADCALL (|random|) (|getShellEntry| $ 28)) 'NIL) ('T 'T))) 
+  (COND ((SPADCALL (|random|) (|getShellEntry| $ 28)) NIL) ('T T))) 
 
 (DEFUN |BOOLEAN;convert;$If;21| (|x| $)
   (COND (|x| '|true|) ('T '|false|))) 
diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index 8f93519a..63b98540 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -227,17 +227,23 @@
              (|PositiveInteger|) (0 . |One|) (4 . |One|) (|Integer|)
              (8 . -) |CHAR;char;Nni$;9| |CHAR;index;Pi$;7|
              |CHAR;ord;$Nni;10| (14 . +) |CHAR;lookup;$Pi;8|
-             (20 . |random|) |CHAR;random;$;11| |CHAR;space;$;12|
-             |CHAR;quote;$;13| |CHAR;escape;$;14| (|OutputForm|)
-             |CHAR;coerce;$Of;15| (|CharacterClass|) (25 . |digit|)
-             (|Character|) (29 . |member?|) |CHAR;digit?;$B;16|
-             (35 . |hexDigit|) |CHAR;hexDigit?;$B;17|
-             (39 . |upperCase|) |CHAR;upperCase?;$B;18|
-             (43 . |lowerCase|) |CHAR;lowerCase?;$B;19|
-             (47 . |alphabetic|) |CHAR;alphabetic?;$B;20|
-             (51 . |alphanumeric|) |CHAR;alphanumeric?;$B;21|
-             (|String|) (55 . |new|) (61 . |concat|) |CHAR;latex;$S;22|
-             (67 . |#|) (72 . |one?|) (77 . |minIndex|) (82 . |elt|)
+             (20 . |random|) |CHAR;random;$;11|
+             (CONS IDENTITY
+                   (FUNCALL (|dispatchFunction| |CHAR;space;$;12|) $))
+             (CONS IDENTITY
+                   (FUNCALL (|dispatchFunction| |CHAR;quote;$;13|) $))
+             (CONS IDENTITY
+                   (FUNCALL (|dispatchFunction| |CHAR;escape;$;14|) $))
+             (|OutputForm|) |CHAR;coerce;$Of;15| (|CharacterClass|)
+             (25 . |digit|) (|Character|) (29 . |member?|)
+             |CHAR;digit?;$B;16| (35 . |hexDigit|)
+             |CHAR;hexDigit?;$B;17| (39 . |upperCase|)
+             |CHAR;upperCase?;$B;18| (43 . |lowerCase|)
+             |CHAR;lowerCase?;$B;19| (47 . |alphabetic|)
+             |CHAR;alphabetic?;$B;20| (51 . |alphanumeric|)
+             |CHAR;alphanumeric?;$B;21| (|String|) (55 . |new|)
+             (61 . |concat|) |CHAR;latex;$S;22| (67 . |#|)
+             (72 . |one?|) (77 . |minIndex|) (82 . |elt|)
              |CHAR;char;S$;23| |CHAR;upperCase;2$;24|
              |CHAR;lowerCase;2$;25| (|SingleInteger|))
           '#(~= 88 |upperCase?| 94 |upperCase| 99 |space| 104 |size|
diff --git a/src/algebra/strap/CLAGG-.lsp b/src/algebra/strap/CLAGG-.lsp
index 6dae1744..15cd3abb 100644
--- a/src/algebra/strap/CLAGG-.lsp
+++ b/src/algebra/strap/CLAGG-.lsp
@@ -92,7 +92,7 @@
                   (PROGN
                     (LETT #1# (SPADCALL |x| |f|) |CLAGG-;any?;MAB;3|)
                     (COND
-                      (#3# (LETT #2# (COND (#2# 'T) ('T #1#))
+                      (#3# (LETT #2# (COND (#2# T) ('T #1#))
                                  |CLAGG-;any?;MAB;3|))
                       ('T
                        (PROGN
@@ -100,7 +100,7 @@
                          (LETT #3# 'T |CLAGG-;any?;MAB;3|)))))
                   (LETT #0# (CDR #0#) |CLAGG-;any?;MAB;3|) (GO G190)
                   G191 (EXIT NIL))
-             (COND (#3# #2#) ('T 'NIL))))))) 
+             (COND (#3# #2#) ('T NIL))))))) 
 
 (DEFUN |CLAGG-;every?;MAB;4| (|f| |c| $)
   (PROG (|x| #0=#:G1432 #1=#:G1413 #2=#:G1411 #3=#:G1412)
@@ -120,7 +120,7 @@
                   (PROGN
                     (LETT #1# (SPADCALL |x| |f|) |CLAGG-;every?;MAB;4|)
                     (COND
-                      (#3# (LETT #2# (COND (#2# #1#) ('T 'NIL))
+                      (#3# (LETT #2# (COND (#2# #1#) ('T NIL))
                                  |CLAGG-;every?;MAB;4|))
                       ('T
                        (PROGN
@@ -128,7 +128,7 @@
                          (LETT #3# 'T |CLAGG-;every?;MAB;4|)))))
                   (LETT #0# (CDR #0#) |CLAGG-;every?;MAB;4|) (GO G190)
                   G191 (EXIT NIL))
-             (COND (#3# #2#) ('T 'T))))))) 
+             (COND (#3# #2#) ('T T))))))) 
 
 (DEFUN |CLAGG-;find;MAU;5| (|f| |c| $)
   (SPADCALL |f| (SPADCALL |c| (|getShellEntry| $ 9))
diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp
index acd6d919..349e80b8 100644
--- a/src/algebra/strap/EUCDOM-.lsp
+++ b/src/algebra/strap/EUCDOM-.lsp
@@ -37,8 +37,8 @@
 
 (DEFUN |EUCDOM-;sizeLess?;2SB;1| (|x| |y| $)
   (COND
-    ((SPADCALL |y| (|getShellEntry| $ 8)) 'NIL)
-    ((SPADCALL |x| (|getShellEntry| $ 8)) 'T)
+    ((SPADCALL |y| (|getShellEntry| $ 8)) NIL)
+    ((SPADCALL |x| (|getShellEntry| $ 8)) T)
     ('T
      (< (SPADCALL |x| (|getShellEntry| $ 12))
         (SPADCALL |y| (|getShellEntry| $ 12)))))) 
diff --git a/src/algebra/strap/FFIELDC-.lsp b/src/algebra/strap/FFIELDC-.lsp
index d2fcf373..33406123 100644
--- a/src/algebra/strap/FFIELDC-.lsp
+++ b/src/algebra/strap/FFIELDC-.lsp
@@ -102,7 +102,7 @@
                     (|spadConstant| $ 41))
                    ('T 1))
                  |FFIELDC-;createPrimitiveElement;S;8|)
-           (LETT |found| 'NIL |FFIELDC-;createPrimitiveElement;S;8|)
+           (LETT |found| NIL |FFIELDC-;createPrimitiveElement;S;8|)
            (SEQ (LETT |i| |start|
                       |FFIELDC-;createPrimitiveElement;S;8|)
                 G190 (COND ((NULL (NOT |found|)) (GO G191)))
@@ -128,13 +128,13 @@
   (PROG (|explist| |q| |exp| #0=#:G1514 |equalone|)
     (RETURN
       (SEQ (COND
-             ((SPADCALL |a| (|getShellEntry| $ 16)) 'NIL)
+             ((SPADCALL |a| (|getShellEntry| $ 16)) NIL)
              ('T
               (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 56))
                          |FFIELDC-;primitive?;SB;9|)
                    (LETT |q| (- (SPADCALL (|getShellEntry| $ 40)) 1)
                          |FFIELDC-;primitive?;SB;9|)
-                   (LETT |equalone| 'NIL |FFIELDC-;primitive?;SB;9|)
+                   (LETT |equalone| NIL |FFIELDC-;primitive?;SB;9|)
                    (SEQ (LETT |exp| NIL |FFIELDC-;primitive?;SB;9|)
                         (LETT #0# |explist| |FFIELDC-;primitive?;SB;9|)
                         G190
@@ -296,7 +296,7 @@
                                           (LETT |end|
                                            (QUOTIENT2 (- |fac| 1) |n|)
                                            |FFIELDC-;discreteLog;SNni;11|)
-                                          (LETT |found| 'NIL
+                                          (LETT |found| NIL
                                            |FFIELDC-;discreteLog;SNni;11|)
                                           (LETT |disc1| 0
                                            |FFIELDC-;discreteLog;SNni;11|)
@@ -321,7 +321,7 @@
                                              (COND
                                                ((QEQCAR |rho| 0)
                                                 (SEQ
-                                                 (LETT |found| 'T
+                                                 (LETT |found| T
                                                   |FFIELDC-;discreteLog;SNni;11|)
                                                  (EXIT
                                                   (LETT |disc1|
@@ -515,7 +515,7 @@
               (|spadConstant| $ 103))
              ('T
               (SEQ (LETT |flist|
-                         (SPADCALL |f| 'T (|getShellEntry| $ 107))
+                         (SPADCALL |f| T (|getShellEntry| $ 107))
                          |FFIELDC-;factorSquareFreePolynomial|)
                    (EXIT (SPADCALL
                              (SPADCALL (QCAR |flist|)
diff --git a/src/algebra/strap/HOAGG-.lsp b/src/algebra/strap/HOAGG-.lsp
index 0b0cd4b0..876ac7a3 100644
--- a/src/algebra/strap/HOAGG-.lsp
+++ b/src/algebra/strap/HOAGG-.lsp
@@ -62,7 +62,7 @@
                   (PROGN
                     (LETT #1# (SPADCALL |x| |f|) |HOAGG-;any?;MAB;3|)
                     (COND
-                      (#3# (LETT #2# (COND (#2# 'T) ('T #1#))
+                      (#3# (LETT #2# (COND (#2# T) ('T #1#))
                                  |HOAGG-;any?;MAB;3|))
                       ('T
                        (PROGN
@@ -70,7 +70,7 @@
                          (LETT #3# 'T |HOAGG-;any?;MAB;3|)))))
                   (LETT #0# (CDR #0#) |HOAGG-;any?;MAB;3|) (GO G190)
                   G191 (EXIT NIL))
-             (COND (#3# #2#) ('T 'NIL))))))) 
+             (COND (#3# #2#) ('T NIL))))))) 
 
 (DEFUN |HOAGG-;every?;MAB;4| (|f| |c| $)
   (PROG (|x| #0=#:G1430 #1=#:G1412 #2=#:G1410 #3=#:G1411)
@@ -90,7 +90,7 @@
                   (PROGN
                     (LETT #1# (SPADCALL |x| |f|) |HOAGG-;every?;MAB;4|)
                     (COND
-                      (#3# (LETT #2# (COND (#2# #1#) ('T 'NIL))
+                      (#3# (LETT #2# (COND (#2# #1#) ('T NIL))
                                  |HOAGG-;every?;MAB;4|))
                       ('T
                        (PROGN
@@ -98,7 +98,7 @@
                          (LETT #3# 'T |HOAGG-;every?;MAB;4|)))))
                   (LETT #0# (CDR #0#) |HOAGG-;every?;MAB;4|) (GO G190)
                   G191 (EXIT NIL))
-             (COND (#3# #2#) ('T 'T))))))) 
+             (COND (#3# #2#) ('T T))))))) 
 
 (DEFUN |HOAGG-;count;MANni;5| (|f| |c| $)
   (PROG (|x| #0=#:G1431 #1=#:G1416 #2=#:G1414 #3=#:G1415)
@@ -180,7 +180,7 @@
                              (SPADCALL |a| |b| (|getShellEntry| $ 30))
                              |HOAGG-;=;2AB;9|)
                        (COND
-                         (#4# (LETT #3# (COND (#3# #2#) ('T 'NIL))
+                         (#4# (LETT #3# (COND (#3# #2#) ('T NIL))
                                     |HOAGG-;=;2AB;9|))
                          ('T
                           (PROGN
@@ -191,8 +191,8 @@
                              (LETT #0# (CDR #0#) |HOAGG-;=;2AB;9|))
                            |HOAGG-;=;2AB;9|)
                      (GO G190) G191 (EXIT NIL))
-                (COND (#4# #3#) ('T 'T))))
-             ('T 'NIL)))))) 
+                (COND (#4# #3#) ('T T))))
+             ('T NIL)))))) 
 
 (DEFUN |HOAGG-;coerce;AOf;10| (|x| $)
   (PROG (#0=#:G1434 |a| #1=#:G1435)
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp
index bdcde3bb..1d888979 100644
--- a/src/algebra/strap/ILIST.lsp
+++ b/src/algebra/strap/ILIST.lsp
@@ -261,12 +261,12 @@
   (PROG (#0=#:G1470)
     (RETURN
       (SEQ (EXIT (COND
-                   ((EQ |x| |y|) 'T)
+                   ((EQ |x| |y|) T)
                    ('T
                     (SEQ (SEQ G190
                               (COND
                                 ((NULL (COND
-                                         ((NULL |x|) 'NIL)
+                                         ((NULL |x|) NIL)
                                          ('T (NOT (NULL |y|)))))
                                  (GO G191)))
                               (SEQ (EXIT
@@ -274,7 +274,7 @@
                                       ((SPADCALL (QCAR |x|) (QCAR |y|)
                                         (|getShellEntry| $ 57))
                                        (PROGN
-                                         (LETT #0# 'NIL
+                                         (LETT #0# NIL
                                           |ILIST;=;2$B;22|)
                                          (GO #0#)))
                                       ('T
@@ -285,9 +285,7 @@
                                          (LETT |y| (QCDR |y|)
                                           |ILIST;=;2$B;22|)))))))
                               NIL (GO G190) G191 (EXIT NIL))
-                         (EXIT (COND
-                                 ((NULL |x|) (NULL |y|))
-                                 ('T 'NIL)))))))
+                         (EXIT (COND ((NULL |x|) (NULL |y|)) ('T NIL)))))))
            #0# (EXIT #0#))))) 
 
 (DEFUN |ILIST;latex;$S;23| (|x| $)
@@ -317,14 +315,14 @@
                                         ((SPADCALL |s| (QCAR |x|)
                                           (|getShellEntry| $ 63))
                                          (PROGN
-                                           (LETT #0# 'T
+                                           (LETT #0# T
                                             |ILIST;member?;S$B;24|)
                                            (GO #0#)))
                                         ('T
                                          (LETT |x| (QCDR |x|)
                                           |ILIST;member?;S$B;24|)))))
                            NIL (GO G190) G191 (EXIT NIL))
-                      (EXIT 'NIL)))
+                      (EXIT NIL)))
            #0# (EXIT #0#))))) 
 
 (DEFUN |ILIST;concat!;3$;25| (|x| |y| $)
@@ -403,7 +401,7 @@
                    (SEQ G190
                         (COND
                           ((NULL (COND
-                                   ((NULL |p|) 'NIL)
+                                   ((NULL |p|) NIL)
                                    ('T (NOT (NULL |q|)))))
                            (GO G191)))
                         (COND
diff --git a/src/algebra/strap/INS-.lsp b/src/algebra/strap/INS-.lsp
index f0301013..17951fda 100644
--- a/src/algebra/strap/INS-.lsp
+++ b/src/algebra/strap/INS-.lsp
@@ -29,7 +29,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) |%Boolean|)
                 |INS-;rational?;SB;8|)) 
 
-(PUT '|INS-;rational?;SB;8| '|SPADreplace| '(XLAM (|x|) 'T)) 
+(PUT '|INS-;rational?;SB;8| '|SPADreplace| '(XLAM (|x|) T)) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Shell|) (|%IntegerSection| 0))
                 |INS-;euclideanSize;SNni;9|)) 
@@ -117,7 +117,7 @@
   (SPADCALL (SPADCALL (|spadConstant| $ 22) |n| (|getShellEntry| $ 20))
       (|getShellEntry| $ 23))) 
 
-(DEFUN |INS-;rational?;SB;8| (|x| $) (DECLARE (IGNORE $)) 'T) 
+(DEFUN |INS-;rational?;SB;8| (|x| $) (DECLARE (IGNORE $)) T) 
 
 (DEFUN |INS-;euclideanSize;SNni;9| (|x| $)
   (PROG (#0=#:G1426 #1=#:G1427)
diff --git a/src/algebra/strap/INTDOM-.lsp b/src/algebra/strap/INTDOM-.lsp
index 9cdf7fb7..42b03119 100644
--- a/src/algebra/strap/INTDOM-.lsp
+++ b/src/algebra/strap/INTDOM-.lsp
@@ -31,9 +31,7 @@
     ('T (SPADCALL (|spadConstant| $ 7) |x| (|getShellEntry| $ 15))))) 
 
 (DEFUN |INTDOM-;unit?;SB;4| (|x| $)
-  (COND
-    ((QEQCAR (SPADCALL |x| (|getShellEntry| $ 17)) 1) 'NIL)
-    ('T 'T))) 
+  (COND ((QEQCAR (SPADCALL |x| (|getShellEntry| $ 17)) 1) NIL) ('T T))) 
 
 (DEFUN |INTDOM-;associates?;2SB;5| (|x| |y| $)
   (SPADCALL (QVELT (SPADCALL |x| (|getShellEntry| $ 10)) 1)
@@ -47,8 +45,8 @@
     ((OR (SPADCALL |y| (|getShellEntry| $ 13))
          (OR (QEQCAR (SPADCALL |x| |y| (|getShellEntry| $ 15)) 1)
              (QEQCAR (SPADCALL |y| |x| (|getShellEntry| $ 15)) 1)))
-     'NIL)
-    ('T 'T))) 
+     NIL)
+    ('T T))) 
 
 (DEFUN |IntegralDomain&| (|#1|)
   (PROG (|dv$1| |dv$| $ |pv$|)
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 53fd9c9e..0e14d2ed 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -208,7 +208,7 @@
                                   |ISTRING;replace;$Us2$;15|)
                        (|check-subtype| (>= #0# 0)
                            '(|NonNegativeInteger|) #0#))
-                     (SPADCALL (|getShellEntry| $ 53)))
+                     (|spadConstant| $ 53))
                  |ISTRING;replace;$Us2$;15|)
            (SEQ (LETT |i| 0 |ISTRING;replace;$Us2$;15|)
                 (LETT #1# (- |l| 1) |ISTRING;replace;$Us2$;15|)
@@ -266,7 +266,7 @@
                       (EXIT (COND
                               ((< |startpos| 0)
                                (|error| "index out of bounds"))
-                              ((> |np| (- |nw| |startpos|)) 'NIL)
+                              ((> |np| (- |nw| |startpos|)) NIL)
                               ('T
                                (SEQ (SEQ
                                      (EXIT
@@ -290,7 +290,7 @@
                                             (PROGN
                                               (LETT #2#
                                                (PROGN
-                                                 (LETT #1# 'NIL
+                                                 (LETT #1# NIL
                                                   |ISTRING;substring?;2$IB;17|)
                                                  (GO #1#))
                                                |ISTRING;substring?;2$IB;17|)
@@ -302,7 +302,7 @@
                                         |ISTRING;substring?;2$IB;17|)
                                        (GO G190) G191 (EXIT NIL)))
                                      #2# (EXIT #2#))
-                                    (EXIT 'T)))))))
+                                    (EXIT T)))))))
            #1# (EXIT #1#))))) 
 
 (DEFUN |ISTRING;position;2$2I;18| (|s| |t| |startpos| $)
@@ -403,7 +403,7 @@
            (LETT |n| (SPADCALL |t| (|getShellEntry| $ 47))
                  |ISTRING;suffix?;2$B;21|)
            (EXIT (COND
-                   ((> |m| |n|) 'NIL)
+                   ((> |m| |n|) NIL)
                    ('T
                     (|ISTRING;substring?;2$IB;17| |s| |t|
                         (- (+ (|getShellEntry| $ 6) |n|) |m|) $)))))))) 
@@ -428,7 +428,7 @@
            (SEQ G190
                 (COND
                   ((NULL (COND
-                           ((> |i| |n|) 'NIL)
+                           ((> |i| |n|) NIL)
                            ('T
                             (>= (LETT |j|
                                       (|ISTRING;position;C$2I;19| |c|
@@ -490,7 +490,7 @@
            (SEQ G190
                 (COND
                   ((NULL (COND
-                           ((> |i| |n|) 'NIL)
+                           ((> |i| |n|) NIL)
                            ('T
                             (>= (LETT |j|
                                       (|ISTRING;position;Cc$2I;20| |cc|
@@ -644,7 +644,7 @@
                             (LETT #0# (CDR #0#) |ISTRING;concat;L$;28|)
                             (GO G190) G191 (EXIT NIL))
                        (COND (#3# #2#) ('T 0)))
-                     (SPADCALL (|getShellEntry| $ 53)))
+                     (|spadConstant| $ 53))
                  |ISTRING;concat;L$;28|)
            (LETT |i| (|getShellEntry| $ 6) |ISTRING;concat;L$;28|)
            (SEQ (LETT |s| NIL |ISTRING;concat;L$;28|)
@@ -770,7 +770,7 @@
                                              $)
                                             |target|
                                             (|getShellEntry| $ 95)))
-                                          (EXIT 'NIL)))))
+                                          (EXIT NIL)))))
                                     (LETT |i| |p|
                                      |ISTRING;match?;2$CB;34|)
                                     (LETT |q|
@@ -809,7 +809,7 @@
                                        (COND
                                          ((EQL |i| (- |m| 1))
                                           (PROGN
-                                            (LETT #3# 'NIL
+                                            (LETT #3# NIL
                                              |ISTRING;match?;2$CB;34|)
                                             (GO #3#)))
                                          ('T
@@ -845,8 +845,8 @@
                                               (|getShellEntry| $ 24))
                                              $)
                                             |target| $))
-                                          (EXIT 'NIL)))))
-                                    (EXIT 'T)))))))
+                                          (EXIT NIL)))))
+                                    (EXIT T)))))))
            #3# (EXIT #3#))))) 
 
 (DEFUN |IndexedString| (#0=#:G1547)
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp
index 4e255fbb..544d88fe 100644
--- a/src/algebra/strap/LIST.lsp
+++ b/src/algebra/strap/LIST.lsp
@@ -64,7 +64,7 @@
   (SEQ (SPADCALL |dev| (|getShellEntry| $ 16))
        (SPADCALL |dev| "list1" "list" (|getShellEntry| $ 18))
        (SEQ G190 (COND ((NULL (NOT (NULL |x|))) (GO G191)))
-            (SEQ (SPADCALL |dev| (|SPADfirst| |x|) 'NIL
+            (SEQ (SPADCALL |dev| (|SPADfirst| |x|) NIL
                      (|getShellEntry| $ 22))
                  (EXIT (LETT |x| (CDR |x|) |LIST;writeOMList|)))
             NIL (GO G190) G191 (EXIT NIL))
@@ -273,7 +273,9 @@
 
 (MAKEPROP '|List| '|infovec|
     (LIST '#(NIL NIL NIL NIL NIL (|IndexedList| 6 (NRTEVAL 1))
-             (|local| |#1|) (|Integer|) (0 . |One|) |LIST;nil;$;1|
+             (|local| |#1|) (|Integer|) (0 . |One|)
+             (CONS IDENTITY
+                   (FUNCALL (|dispatchFunction| |LIST;nil;$;1|) $))
              (|Boolean|) |LIST;null;$B;2| |LIST;cons;S2$;3|
              |LIST;append;3$;4| (|Void|) (|OpenMathDevice|)
              (4 . |OMputApp|) (|String|) (9 . |OMputSymbol|)
diff --git a/src/algebra/strap/LNAGG-.lsp b/src/algebra/strap/LNAGG-.lsp
index 2d48d5c5..d91e5ede 100644
--- a/src/algebra/strap/LNAGG-.lsp
+++ b/src/algebra/strap/LNAGG-.lsp
@@ -38,7 +38,7 @@
   (COND
     ((>= |i| (SPADCALL |a| (|getShellEntry| $ 9)))
      (NOT (> |i| (SPADCALL |a| (|getShellEntry| $ 10)))))
-    ('T 'NIL))) 
+    ('T NIL))) 
 
 (DEFUN |LNAGG-;concat;ASA;3| (|a| |x| $)
   (SPADCALL |a| (SPADCALL 1 |x| (|getShellEntry| $ 22))
diff --git a/src/algebra/strap/LSAGG-.lsp b/src/algebra/strap/LSAGG-.lsp
index 91682b5f..c345ca12 100644
--- a/src/algebra/strap/LSAGG-.lsp
+++ b/src/algebra/strap/LSAGG-.lsp
@@ -113,7 +113,7 @@
       (SEQ (SEQ G190
                 (COND
                   ((NULL (COND
-                           ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
+                           ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
                            ('T
                             (NOT (SPADCALL
                                      (SPADCALL |x|
@@ -195,7 +195,7 @@
                           ((NULL (COND
                                    ((SPADCALL |p|
                                      (|getShellEntry| $ 16))
-                                    'NIL)
+                                    NIL)
                                    ('T
                                     (NOT
                                      (SPADCALL |q|
@@ -288,7 +288,7 @@
       (SEQ (SEQ G190
                 (COND
                   ((NULL (COND
-                           ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
+                           ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
                            ('T
                             (SPADCALL
                                 (SPADCALL |x| (|getShellEntry| $ 18))
@@ -413,7 +413,7 @@
   (SEQ (SEQ G190
             (COND
               ((NULL (COND
-                       ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
+                       ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
                        ('T
                         (NOT (SPADCALL
                                  (SPADCALL |x| (|getShellEntry| $ 18))
@@ -435,7 +435,7 @@
                 G190
                 (COND
                   ((NULL (COND
-                           ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
+                           ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
                            ('T
                             (NOT (SPADCALL
                                      (SPADCALL |x|
@@ -490,7 +490,7 @@
   (PROG (#0=#:G1517 |p|)
     (RETURN
       (SEQ (EXIT (COND
-                   ((SPADCALL |l| (|getShellEntry| $ 16)) 'T)
+                   ((SPADCALL |l| (|getShellEntry| $ 16)) T)
                    ('T
                     (SEQ (LETT |p|
                                (SPADCALL |l| (|getShellEntry| $ 17))
@@ -511,7 +511,7 @@
                                           (|getShellEntry| $ 18))
                                          |f|))
                                        (PROGN
-                                         (LETT #0# 'NIL
+                                         (LETT #0# NIL
                                           |LSAGG-;sorted?;MAB;15|)
                                          (GO #0#)))
                                       ('T
@@ -522,7 +522,7 @@
                                          (|getShellEntry| $ 17))
                                         |LSAGG-;sorted?;MAB;15|)))))
                               NIL (GO G190) G191 (EXIT NIL))
-                         (EXIT 'T)))))
+                         (EXIT T)))))
            #0# (EXIT #0#))))) 
 
 (DEFUN |LSAGG-;reduce;MA2S;16| (|f| |x| |i| $)
@@ -551,7 +551,7 @@
            (SEQ G190
                 (COND
                   ((NULL (COND
-                           ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
+                           ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
                            ('T
                             (SPADCALL |r| |a| (|getShellEntry| $ 63)))))
                    (GO G191)))
@@ -589,7 +589,7 @@
            (SEQ G190
                 (COND
                   ((NULL (COND
-                           ((SPADCALL |x| (|getShellEntry| $ 16)) 'NIL)
+                           ((SPADCALL |x| (|getShellEntry| $ 16)) NIL)
                            ('T
                             (NOT (SPADCALL |y| (|getShellEntry| $ 16))))))
                    (GO G191)))
@@ -688,7 +688,7 @@
                                 ((NULL (COND
                                          ((SPADCALL |z|
                                            (|getShellEntry| $ 16))
-                                          'NIL)
+                                          NIL)
                                          ('T
                                           (NOT
                                            (SPADCALL |x|
@@ -733,7 +733,7 @@
                                 ((NULL (COND
                                          ((SPADCALL |x|
                                            (|getShellEntry| $ 16))
-                                          'NIL)
+                                          NIL)
                                          ('T
                                           (SPADCALL |w|
                                            (SPADCALL |x|
@@ -794,7 +794,7 @@
                              ((NULL (COND
                                       ((SPADCALL |x|
                                         (|getShellEntry| $ 16))
-                                       'NIL)
+                                       NIL)
                                       ('T
                                        (NOT
                                         (SPADCALL |y|
@@ -833,7 +833,7 @@
                               ((SPADCALL |x| (|getShellEntry| $ 16))
                                (NOT (SPADCALL |y|
                                      (|getShellEntry| $ 16))))
-                              ('T 'NIL)))))
+                              ('T NIL)))))
            #0# (EXIT #0#))))) 
 
 (DEFUN |ListAggregate&| (|#1| |#2|)
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 46aa1832..99e80e06 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -560,10 +560,9 @@
   (FORMAT NIL (|getShellEntry| $ 6) |f|)) 
 
 (DEFUN |OUTFORM;outputForm;S$;15| (|s| $)
-  (SPADCALL (SPADCALL (|getShellEntry| $ 27))
-      (SPADCALL |s| (SPADCALL (|getShellEntry| $ 27))
-                (|getShellEntry| $ 28))
-      (|getShellEntry| $ 29))) 
+  (SPADCALL (|spadConstant| $ 27)
+            (SPADCALL |s| (|spadConstant| $ 27) (|getShellEntry| $ 28))
+            (|getShellEntry| $ 29))) 
 
 (DEFUN |OUTFORM;width;$I;16| (|a| $)
   (DECLARE (IGNORE $))
@@ -850,10 +849,10 @@
                               ((STRINGP |a|) (INTERN |a|))
                               ('T
                                (PROGN
-                                 (LETT #0# 'NIL |OUTFORM;infix?;$B;74|)
+                                 (LETT #0# NIL |OUTFORM;infix?;$B;74|)
                                  (GO #0#))))
                             |OUTFORM;infix?;$B;74|)
-                      (EXIT (COND ((GET |e| 'INFIXOP) 'T) ('T 'NIL)))))
+                      (EXIT (COND ((GET |e| 'INFIXOP) T) ('T NIL)))))
            #0# (EXIT #0#))))) 
 
 (DEFUN |OUTFORM;elt;$L$;75| (|a| |l| $)
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 1142c59e..3a333e20 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -220,7 +220,7 @@
                   ((NULL (COND
                            ((>= (LENGTH |ns|) 2)
                             (ZEROP (|SPADfirst| |ns|)))
-                           ('T 'NIL)))
+                           ('T NIL)))
                    (GO G191)))
                 (SEQ (EXIT (LETT |ns| (CDR |ns|) |SYMBOL;syprefix|)))
                 NIL (GO G190) G191 (EXIT NIL))
diff --git a/src/algebra/strap/URAGG-.lsp b/src/algebra/strap/URAGG-.lsp
index 8cb8d4dc..9528b39e 100644
--- a/src/algebra/strap/URAGG-.lsp
+++ b/src/algebra/strap/URAGG-.lsp
@@ -129,7 +129,7 @@
 
 (DEFUN |URAGG-;cyclic?;AB;6| (|x| $)
   (COND
-    ((SPADCALL |x| (|getShellEntry| $ 20)) 'NIL)
+    ((SPADCALL |x| (|getShellEntry| $ 20)) NIL)
     ('T
      (NOT (SPADCALL (|URAGG-;findCycle| |x| $) (|getShellEntry| $ 20)))))) 
 
@@ -179,7 +179,7 @@
                   ((NULL (COND
                            ((> |i| 0)
                             (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
-                           ('T 'NIL)))
+                           ('T NIL)))
                    (GO G191)))
                 (SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14))
                            |URAGG-;less?;ANniB;12|)
@@ -196,7 +196,7 @@
                   ((NULL (COND
                            ((> |i| 0)
                             (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
-                           ('T 'NIL)))
+                           ('T NIL)))
                    (GO G191)))
                 (SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14))
                            |URAGG-;more?;ANniB;13|)
@@ -205,7 +205,7 @@
            (EXIT (COND
                    ((ZEROP |i|)
                     (NOT (SPADCALL |l| (|getShellEntry| $ 20))))
-                   ('T 'NIL))))))) 
+                   ('T NIL))))))) 
 
 (DEFUN |URAGG-;size?;ANniB;14| (|l| |n| $)
   (PROG (|i|)
@@ -214,7 +214,7 @@
            (SEQ G190
                 (COND
                   ((NULL (COND
-                           ((SPADCALL |l| (|getShellEntry| $ 20)) 'NIL)
+                           ((SPADCALL |l| (|getShellEntry| $ 20)) NIL)
                            ('T (> |i| 0))))
                    (GO G191)))
                 (SEQ (LETT |l| (SPADCALL |l| (|getShellEntry| $ 14))
@@ -223,7 +223,7 @@
                 NIL (GO G190) G191 (EXIT NIL))
            (EXIT (COND
                    ((SPADCALL |l| (|getShellEntry| $ 20)) (ZEROP |i|))
-                   ('T 'NIL))))))) 
+                   ('T NIL))))))) 
 
 (DEFUN |URAGG-;#;ANni;15| (|x| $)
   (PROG (|k|)
@@ -455,14 +455,14 @@
   (PROG (|k| #0=#:G1509)
     (RETURN
       (SEQ (EXIT (COND
-                   ((SPADCALL |x| |y| (|getShellEntry| $ 53)) 'T)
+                   ((SPADCALL |x| |y| (|getShellEntry| $ 53)) T)
                    ('T
                     (SEQ (SEQ (LETT |k| 0 |URAGG-;=;2AB;23|) G190
                               (COND
                                 ((NULL (COND
                                          ((SPADCALL |x|
                                            (|getShellEntry| $ 20))
-                                          'NIL)
+                                          NIL)
                                          ('T
                                           (NOT
                                            (SPADCALL |y|
@@ -483,7 +483,7 @@
                                          (|getShellEntry| $ 8))
                                         (|getShellEntry| $ 66))
                                        (PROGN
-                                         (LETT #0# 'NIL
+                                         (LETT #0# NIL
                                           |URAGG-;=;2AB;23|)
                                          (GO #0#)))
                                       ('T
@@ -502,7 +502,7 @@
                          (EXIT (COND
                                  ((SPADCALL |x| (|getShellEntry| $ 20))
                                   (SPADCALL |y| (|getShellEntry| $ 20)))
-                                 ('T 'NIL)))))))
+                                 ('T NIL)))))))
            #0# (EXIT #0#))))) 
 
 (DEFUN |URAGG-;node?;2AB;24| (|u| |v| $)
@@ -518,7 +518,7 @@
                                         ((SPADCALL |u| |v|
                                           (|getShellEntry| $ 68))
                                          (PROGN
-                                           (LETT #0# 'T
+                                           (LETT #0# T
                                             |URAGG-;node?;2AB;24|)
                                            (GO #0#)))
                                         ('T