diff --git a/code/array.lisp b/code/array.lisp
index def4c73c28ed0c2607911baa36a5ff46526b065e..3602f91b80bc2b83284dca89b436e218692635fd 100644
--- a/code/array.lisp
+++ b/code/array.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.28 1998/07/16 13:30:42 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/array.lisp,v 1.29 1998/07/24 17:17:49 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -128,26 +128,20 @@
     ((unsigned-byte 8) (values #.vm:simple-array-unsigned-byte-8-type 8))
     ((unsigned-byte 16) (values #.vm:simple-array-unsigned-byte-16-type 16))
     ((unsigned-byte 32) (values #.vm:simple-array-unsigned-byte-32-type 32))
-    #+signed-array ((signed-byte 8)
-		    (values #.vm:simple-array-signed-byte-8-type 8))
-    #+signed-array ((signed-byte 16)
-		    (values #.vm:simple-array-signed-byte-16-type 16))
-    #+signed-array ((signed-byte 30)
-		    (values #.vm:simple-array-signed-byte-30-type 32))
-    #+signed-array ((signed-byte 32)
-		    (values #.vm:simple-array-signed-byte-32-type 32))
+    ((signed-byte 8) (values #.vm:simple-array-signed-byte-8-type 8))
+    ((signed-byte 16) (values #.vm:simple-array-signed-byte-16-type 16))
+    ((signed-byte 30) (values #.vm:simple-array-signed-byte-30-type 32))
+    ((signed-byte 32) (values #.vm:simple-array-signed-byte-32-type 32))
     (single-float (values #.vm:simple-array-single-float-type 32))
     (double-float (values #.vm:simple-array-double-float-type 64))
     #+long-float
     (long-float
      (values #.vm:simple-array-long-float-type #+x86 96 #+sparc 128))
-    #+complex-float
     ((complex single-float)
      (values #.vm:simple-array-complex-single-float-type 64))
-    #+complex-float
     ((complex double-float)
      (values #.vm:simple-array-complex-double-float-type 128))
-    #+(and complex-float long-float)
+    #+long-float
     ((complex long-float)
      (values #.vm:simple-array-complex-long-float-type #+x86 192 #+sparc 256))
     (t (values #.vm:simple-vector-type #.vm:word-bits))))
@@ -336,16 +330,16 @@
        (unsigned-byte 8)
        (unsigned-byte 16)
        (unsigned-byte 32)
-       #+signed-array (signed-byte 8)
-       #+signed-array (signed-byte 16)
-       #+signed-array (signed-byte 30)
-       #+signed-array (signed-byte 32)
+       (signed-byte 8)
+       (signed-byte 16)
+       (signed-byte 30)
+       (signed-byte 32)
        single-float
        double-float
        #+long-float long-float
-       #+complex-float (complex single-float)
-       #+complex-float (complex double-float)
-       #+(and complex-float long-float) (complex long-float)))))
+       (complex single-float)
+       (complex double-float)
+       #+long-float (complex long-float)))))
 
 (defun data-vector-set (array index new-value)
   (with-array-data ((vector array) (index index) (end))
@@ -368,16 +362,16 @@
        (unsigned-byte 8)
        (unsigned-byte 16)
        (unsigned-byte 32)
-       #+signed-array (signed-byte 8)
-       #+signed-array (signed-byte 16)
-       #+signed-array (signed-byte 30)
-       #+signed-array (signed-byte 32)
+       (signed-byte 8)
+       (signed-byte 16)
+       (signed-byte 30)
+       (signed-byte 32)
        single-float
        double-float
        #+long-float long-float
-       #+complex-float (complex single-float)
-       #+complex-float (complex double-float)
-       #+(and complex-float long-float) (complex long-float)))))
+       (complex single-float)
+       (complex double-float)
+       #+long-float (complex long-float)))))
 
 
 
@@ -530,19 +524,17 @@
        (vm:simple-array-unsigned-byte-8-type '(unsigned-byte 8))
        (vm:simple-array-unsigned-byte-16-type '(unsigned-byte 16))
        (vm:simple-array-unsigned-byte-32-type '(unsigned-byte 32))
-       #+signed-array (vm:simple-array-signed-byte-8-type '(signed-byte 8))
-       #+signed-array (vm:simple-array-signed-byte-16-type '(signed-byte 16))
-       #+signed-array (vm:simple-array-signed-byte-30-type '(signed-byte 30))
-       #+signed-array (vm:simple-array-signed-byte-32-type '(signed-byte 32))
+       (vm:simple-array-signed-byte-8-type '(signed-byte 8))
+       (vm:simple-array-signed-byte-16-type '(signed-byte 16))
+       (vm:simple-array-signed-byte-30-type '(signed-byte 30))
+       (vm:simple-array-signed-byte-32-type '(signed-byte 32))
        (vm:simple-array-single-float-type 'single-float)
        (vm:simple-array-double-float-type 'double-float)
        #+long-float
        (vm:simple-array-long-float-type 'long-float)
-       #+complex-float
        (vm:simple-array-complex-single-float-type '(complex single-float))
-       #+complex-float
        (vm:simple-array-complex-double-float-type '(complex double-float))
-       #+(and complex-float long-float)
+       #+long-float
        (vm:simple-array-complex-long-float-type '(complex long-float))
        ((vm:simple-array-type vm:complex-vector-type vm:complex-array-type)
 	(with-array-data ((array array) (start) (end))
@@ -839,21 +831,19 @@
 	((simple-array (unsigned-byte 8) (*)) 0)
 	((simple-array (unsigned-byte 16) (*)) 0)
 	((simple-array (unsigned-byte 32) (*)) 0)
-	#+signed-array ((simple-array (signed-byte 8) (*)) 0)
-	#+signed-array ((simple-array (signed-byte 16) (*)) 0)
-	#+signed-array ((simple-array (signed-byte 30) (*)) 0)
-	#+signed-array ((simple-array (signed-byte 32) (*)) 0)
+	((simple-array (signed-byte 8) (*)) 0)
+	((simple-array (signed-byte 16) (*)) 0)
+	((simple-array (signed-byte 30) (*)) 0)
+	((simple-array (signed-byte 32) (*)) 0)
 	((simple-array single-float (*)) (coerce 0 'single-float))
 	((simple-array double-float (*)) (coerce 0 'double-float))
 	#+long-float
 	((simple-array long-float (*)) (coerce 0 'long-float))
-	#+complex-float
 	((simple-array (complex single-float) (*))
 	 (coerce 0 '(complex single-float)))
-	#+complex-float
 	((simple-array (complex double-float) (*))
 	 (coerce 0 '(complex double-float)))
-	#+(and complex-float long-float)
+	#+long-float
 	((simple-array (complex long-float) (*))
 	 (coerce 0 '(complex long-float))))))
   ;; Only arrays have fill-pointers, but vectors have their length parameter
diff --git a/code/class.lisp b/code/class.lisp
index b041bc19eef41dd1b0557324f1f45abd0ddc920d..f45af4c181543181e5f14c6f09e87c6851ee1c21 100644
--- a/code/class.lisp
+++ b/code/class.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/class.lisp,v 1.40 1998/05/04 01:27:10 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/class.lisp,v 1.41 1998/07/24 17:17:50 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -605,7 +605,6 @@
 	   :inherits (vector simple-array array sequence generic-vector
 		      generic-array mutable-sequence mutable-collection
 		      generic-sequence collection))
-	  #+signed-array 
 	  (simple-array-signed-byte-8
 	   :translation (simple-array (signed-byte 8) (*))
 	   :codes (#.vm:simple-array-signed-byte-8-type)
@@ -613,7 +612,6 @@
 	   :inherits (vector simple-array array sequence generic-vector
 		      generic-array mutable-sequence mutable-collection
 		      generic-sequence collection))
-	  #+signed-array 
 	  (simple-array-signed-byte-16
 	   :translation (simple-array (signed-byte 16) (*))
 	   :codes (#.vm:simple-array-signed-byte-16-type)
@@ -621,7 +619,6 @@
 	   :inherits (vector simple-array array sequence generic-vector
 		      generic-array mutable-sequence mutable-collection
 		      generic-sequence collection))
-	  #+signed-array 
 	  (simple-array-signed-byte-30
 	   :translation (simple-array (signed-byte 30) (*))
 	   :codes (#.vm:simple-array-signed-byte-30-type)
@@ -629,7 +626,6 @@
 	   :inherits (vector simple-array array sequence generic-vector
 		      generic-array mutable-sequence mutable-collection
 		      generic-sequence collection))
-	  #+signed-array 
 	  (simple-array-signed-byte-32
 	   :translation (simple-array (signed-byte 32) (*))
 	   :codes (#.vm:simple-array-signed-byte-32-type)
@@ -659,7 +655,6 @@
 	   :inherits (vector simple-array array sequence generic-vector
 		      generic-array mutable-sequence mutable-collection
 		      generic-sequence collection))
-	  #+complex-float
 	  (simple-array-complex-single-float
 	   :translation (simple-array (complex single-float) (*))
 	   :codes (#.vm:simple-array-complex-single-float-type)
@@ -667,7 +662,6 @@
 	   :inherits (vector simple-array array sequence generic-vector
 		      generic-array mutable-sequence mutable-collection
 		      generic-sequence collection))
-	  #+complex-float
 	  (simple-array-complex-double-float
 	   :translation (simple-array (complex double-float) (*))
 	   :codes (#.vm:simple-array-complex-double-float-type)
@@ -675,7 +669,7 @@
 	   :inherits (vector simple-array array sequence generic-vector
 		      generic-array mutable-sequence mutable-collection
 		      generic-sequence collection))
-	  #+(and complex-float long-float)
+	  #+long-float
 	  (simple-array-complex-long-float
 	   :translation (simple-array (complex long-float) (*))
 	   :codes (#.vm:simple-array-complex-long-float-type)
@@ -704,17 +698,15 @@
 	  (number :translation number :inherits (generic-number))
 	  (complex :translation complex :inherits (number generic-number)
 		   :codes (#.vm:complex-type))
-	  #+complex-float
 	  (complex-single-float
 	   :translation (complex single-float)
 	   :inherits (complex number generic-number)
 	   :codes (#.vm:complex-single-float-type))
-	  #+complex-float
 	  (complex-double-float
 	   :translation (complex double-float)
 	   :inherits (complex number generic-number)
 	   :codes (#.vm:complex-double-float-type))
-	  #+(and complex-float long-float)
+	  #+long-float
 	  (complex-long-float
 	   :translation (complex long-float)
 	   :inherits (complex number generic-number)
diff --git a/code/debug-int.lisp b/code/debug-int.lisp
index a89aca2c96b8695592429681d048bec6f084d20b..6f8d5792398d7a26186d71a94a1cc39b01dbf5ef 100644
--- a/code/debug-int.lisp
+++ b/code/debug-int.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.91 1998/04/10 11:42:38 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.92 1998/07/24 17:17:50 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -3016,7 +3016,6 @@
       #+long-float
       (#.vm:long-reg-sc-number
        (escaped-float-value long-float))
-      #+complex-float
       (#.vm:complex-single-reg-sc-number
        (if escaped
 	   (complex
@@ -3025,7 +3024,6 @@
 	    (vm:sigcontext-float-register
 	     escaped (1+ (c:sc-offset-offset sc-offset)) 'single-float))
 	   :invalid-value-for-unescaped-register-storage))
-      #+complex-float
       (#.vm:complex-double-reg-sc-number
        (if escaped
 	   (complex
@@ -3035,7 +3033,7 @@
 	     escaped (+ (c:sc-offset-offset sc-offset) #+sparc 2 #-sparc 1)
 	     'double-float))
 	   :invalid-value-for-unescaped-register-storage))
-      #+(and complex-float long-float)
+      #+long-float
       (#.vm:complex-long-reg-sc-number
        (if escaped
 	   (complex
@@ -3058,7 +3056,6 @@
        (with-nfp (nfp)
 	 (system:sap-ref-long nfp (* (c:sc-offset-offset sc-offset)
 				     vm:word-bytes))))
-      #+complex-float
       (#.vm:complex-single-stack-sc-number
        (with-nfp (nfp)
 	 (complex
@@ -3066,7 +3063,6 @@
 					vm:word-bytes))
 	  (system:sap-ref-single nfp (* (1+ (c:sc-offset-offset sc-offset))
 					vm:word-bytes)))))
-      #+complex-float
       (#.vm:complex-double-stack-sc-number
        (with-nfp (nfp)
 	 (complex
@@ -3074,7 +3070,7 @@
 					vm:word-bytes))
 	  (system:sap-ref-double nfp (* (+ (c:sc-offset-offset sc-offset) 2)
 					vm:word-bytes)))))
-      #+(and complex-float long-float)
+      #+long-float
       (#.vm:complex-long-stack-sc-number
        (with-nfp (nfp)
 	 (complex
@@ -3116,7 +3112,6 @@
 		 (vm:sigcontext-float-register
 		  escaped (c:sc-offset-offset sc-offset) ',format)
 		 :invalid-value-for-unescaped-register-storage))
-	     #+complex-float
 	     (escaped-complex-float-value (format)
 	       `(if escaped
 		 (complex
@@ -3171,13 +3166,11 @@
       #+long-float
       (#.vm:long-reg-sc-number
        (escaped-float-value long-float))
-      #+complex-float
       (#.vm:complex-single-reg-sc-number
        (escaped-complex-float-value single-float))
-      #+complex-float
       (#.vm:complex-double-reg-sc-number
        (escaped-complex-float-value double-float))
-      #+(and complex-float long-float)
+      #+long-float
       (#.vm:complex-long-reg-sc-number
        (escaped-complex-float-value long-float))
       (#.vm:single-stack-sc-number
@@ -3190,21 +3183,19 @@
       (#.vm:long-stack-sc-number
        (system:sap-ref-long fp (- (* (+ (c:sc-offset-offset sc-offset) 3)
 				     vm:word-bytes))))
-      #+complex-float
       (#.vm:complex-single-stack-sc-number
        (complex
 	(system:sap-ref-single fp (- (* (1+ (c:sc-offset-offset sc-offset))
 					vm:word-bytes)))
 	(system:sap-ref-single fp (- (* (+ (c:sc-offset-offset sc-offset) 2)
 					vm:word-bytes)))))
-      #+complex-float
       (#.vm:complex-double-stack-sc-number
        (complex
 	(system:sap-ref-double fp (- (* (+ (c:sc-offset-offset sc-offset) 2)
 					vm:word-bytes)))
 	(system:sap-ref-double fp (- (* (+ (c:sc-offset-offset sc-offset) 4)
 					vm:word-bytes)))))
-      #+(and complex-float long-float)
+      #+long-float
       (#.vm:complex-long-stack-sc-number
        (complex
 	(system:sap-ref-long fp (- (* (+ (c:sc-offset-offset sc-offset) 3)
@@ -3335,7 +3326,6 @@
       #+long-float
       (#.vm:long-reg-sc-number
        (set-escaped-float-value long-float value))
-      #+complex-float
       (#.vm:complex-single-reg-sc-number
        (when escaped
 	 (setf (vm:sigcontext-float-register
@@ -3346,7 +3336,6 @@
 		'single-float)
 	       (imagpart value)))
        value)
-      #+complex-float
       (#.vm:complex-double-reg-sc-number
        (when escaped
 	 (setf (vm:sigcontext-float-register
@@ -3358,7 +3347,7 @@
 		'double-float)
 	       (imagpart value)))
        value)
-      #+(and complex-float long-float)
+      #+long-float
       (#.vm:complex-long-reg-sc-number
        (when escaped
 	 (setf (vm:sigcontext-float-register
@@ -3386,7 +3375,6 @@
 	 (setf (system:sap-ref-long nfp (* (c:sc-offset-offset sc-offset)
 					   vm:word-bytes))
 	       (the long-float value))))
-      #+complex-float
       (#.vm:complex-single-stack-sc-number
        (with-nfp (nfp)
 	 (setf (system:sap-ref-single
@@ -3395,7 +3383,6 @@
 	 (setf (system:sap-ref-single
 		nfp (* (1+ (c:sc-offset-offset sc-offset)) vm:word-bytes))
 	       (the single-float (realpart value)))))
-      #+complex-float
       (#.vm:complex-double-stack-sc-number
        (with-nfp (nfp)
 	 (setf (system:sap-ref-double
@@ -3404,7 +3391,7 @@
 	 (setf (system:sap-ref-double
 		nfp (* (+ (c:sc-offset-offset sc-offset) 2) vm:word-bytes))
 	       (the double-float (realpart value)))))
-      #+(and complex-float long-float)
+      #+long-float
       (#.vm:complex-long-stack-sc-number
        (with-nfp (nfp)
 	 (setf (system:sap-ref-long
@@ -3482,7 +3469,6 @@
        (setf (system:sap-ref-long
 	      fp (- (* (+ (c:sc-offset-offset sc-offset) 3) vm:word-bytes)))
 	     (the long-float value)))
-      #+complex-float
       (#.vm:complex-single-stack-sc-number
        (setf (system:sap-ref-single
 	      fp (- (* (1+ (c:sc-offset-offset sc-offset)) vm:word-bytes)))
@@ -3490,7 +3476,6 @@
        (setf (system:sap-ref-single
 	      fp (- (* (+ (c:sc-offset-offset sc-offset) 2) vm:word-bytes)))
 	     (imagpart (the (complex single-float) value))))
-      #+complex-float
       (#.vm:complex-double-stack-sc-number
        (setf (system:sap-ref-double
 	      fp (- (* (+ (c:sc-offset-offset sc-offset) 2) vm:word-bytes)))
@@ -3498,7 +3483,7 @@
        (setf (system:sap-ref-double
 	      fp (- (* (+ (c:sc-offset-offset sc-offset) 4) vm:word-bytes)))
 	     (imagpart (the (complex double-float) value))))
-      #+(and complex-float long-float)
+      #+long-float
       (#.vm:complex-long-stack-sc-number
        (setf (system:sap-ref-long
 	      fp (- (* (+ (c:sc-offset-offset sc-offset) 3) vm:word-bytes)))
diff --git a/code/defstruct.lisp b/code/defstruct.lisp
index d42fa325df1b9dd1aa255baf97b90acbaf7b6790..ca0b26fa74a6d6458dd07421da6ed68221a7e88f 100644
--- a/code/defstruct.lisp
+++ b/code/defstruct.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.63 1998/05/04 01:27:11 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.64 1998/07/24 17:17:53 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -79,9 +79,6 @@
   (declare (type index index))
   (%raw-set-long vec index val))
 
-#+complex-float
-(progn
-
 (defun %raw-ref-complex-single (vec index)
   (declare (type index index))
   (%raw-ref-complex-single vec index))
@@ -108,8 +105,6 @@
   (declare (type index index))
   (%raw-set-complex-long vec index val))
 
-) ; end progn complex-float
-
 (defun %instance-layout (instance)
   (%instance-layout instance))
 
@@ -167,11 +162,9 @@
 (defsetf %raw-ref-double %raw-set-double)
 #+long-float
 (defsetf %raw-ref-long %raw-set-long)
-#+complex-float
 (defsetf %raw-ref-complex-single %raw-set-complex-single)
-#+complex-float
 (defsetf %raw-ref-complex-double %raw-set-complex-double)
-#+(and complex-float long-float)
+#+long-float
 (defsetf %raw-ref-complex-long %raw-set-complex-long)
 (defsetf %instance-layout %set-instance-layout)
 (defsetf %funcallable-instance-info %set-funcallable-instance-info)
@@ -287,9 +280,8 @@
   ;;
   ;; If a raw slot, what it holds.  T means not raw.
   (raw-type t :type (member t single-float double-float #+long-float long-float
-			    #+complex-float complex-single-float
-			    #+complex-float complex-double-float
-			    #+(and complex-float long-float) complex-long-float
+			    complex-single-float complex-double-float
+			    #+long-float complex-long-float
 			    unsigned-byte))
   (read-only nil :type (member t nil)))
 
@@ -622,13 +614,11 @@
 	      #+long-float
 	      ((subtypep type 'long-float)
 	       (values 'long-float #+x86 3 #+sparc 4))
-	      #+complex-float
 	      ((subtypep type '(complex single-float))
 	       (values 'complex-single-float 2))
-	      #+complex-float
 	      ((subtypep type '(complex double-float))
 	       (values 'complex-double-float 4))
-	      #+(and long-float complex-float)
+	      #+long-float
 	      ((subtypep type '(complex long-float))
 	       (values 'complex-long-float #+x86 6 #+sparc 8))
 	      (t (values nil nil)))
@@ -997,11 +987,9 @@
        (double-float '%raw-ref-double)
        #+long-float
        (long-float '%raw-ref-long)
-       #+complex-float
        (complex-single-float '%raw-ref-complex-single)
-       #+complex-float
        (complex-double-float '%raw-ref-complex-double)
-       #+(and complex-float long-float)
+       #+long-float
        (complex-long-float '%raw-ref-complex-long)
        (unsigned-byte 'aref)
        ((t)
@@ -1009,7 +997,7 @@
 	    '%funcallable-instance-info
 	    '%instance-ref)))
      (case rtype
-       #+(and complex-float long-float)
+       #+long-float
        (complex-long-float
 	(truncate (dsd-index slot) #+x86 6 #+sparc 8))
        #+long-float
@@ -1017,10 +1005,8 @@
 	(truncate (dsd-index slot) #+x86 3 #+sparc 4))
        (double-float
 	(ash (dsd-index slot) -1))
-       #+complex-float
        (complex-double-float
 	(ash (dsd-index slot) -2))
-       #+complex-float
        (complex-single-float
 	(ash (dsd-index slot) -1))
        (t
diff --git a/code/interr.lisp b/code/interr.lisp
index ed404b00e26cf5407f26cdbcef4472b48ba1445d..554d07b6a99b475f613e963efaf095970a899c8c 100644
--- a/code/interr.lisp
+++ b/code/interr.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.33 1998/03/21 08:11:57 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.34 1998/07/24 17:17:53 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -364,28 +364,24 @@
 	 :datum object
 	 :expected-type '(simple-array (unsigned-byte 32) (*))))
 
-#+signed-array 
 (deferr object-not-simple-array-signed-byte-8-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (signed-byte 8) (*))))
 
-#+signed-array 
 (deferr object-not-simple-array-signed-byte-16-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (signed-byte 16) (*))))
 
-#+signed-array 
 (deferr object-not-simple-array-signed-byte-30-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (signed-byte 30) (*))))
 
-#+signed-array 
 (deferr object-not-simple-array-signed-byte-32-error (object)
   (error 'type-error
 	 :function-name name
@@ -404,21 +400,19 @@
 	 :datum object
 	 :expected-type '(simple-array double-float (*))))
 
-#+complex-float
 (deferr object-not-simple-array-complex-single-float-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (complex single-float) (*))))
 
-#+complex-float
 (deferr object-not-simple-array-complex-double-float-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(simple-array (complex double-float) (*))))
 
-#+(and complex-float long-float)
+#+long-float
 (deferr object-not-simple-array-complex-long-float-error (object)
   (error 'type-error
 	 :function-name name
@@ -431,28 +425,25 @@
 	 :datum object
 	 :expected-type 'complex))
 
-#+complex-float
 (deferr object-not-complex-rational-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(complex rational)))
 
-#+complex-float
 (deferr object-not-complex-single-float-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(complex single-float)))
 
-#+complex-float
 (deferr object-not-complex-double-float-error (object)
   (error 'type-error
 	 :function-name name
 	 :datum object
 	 :expected-type '(complex double-float)))
 
-#+(and complex-float long-float)
+#+long-float
 (deferr object-not-complex-long-float-error (object)
   (error 'type-error
 	 :function-name name
diff --git a/code/load.lisp b/code/load.lisp
index 5089ed85739f1f6cac8c70325dd26eeed15d60c1..43f588cedc26f8db4312b1c006462b26f3a15ebc 100644
--- a/code/load.lisp
+++ b/code/load.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/load.lisp,v 1.72 1998/07/16 13:30:47 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/load.lisp,v 1.73 1998/07/24 17:17:54 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -786,7 +786,6 @@
   (let ((im (pop-stack)))
     (%make-complex (pop-stack) im)))
 
-#+complex-float
 (define-fop (fop-complex-single-float 72)
   (prepare-for-fast-read-byte *fasl-file*
     (prog1
@@ -794,7 +793,6 @@
 		 (make-single-float (fast-read-s-integer 4)))
       (done-with-fast-read-byte))))
 
-#+complex-float
 (define-fop (fop-complex-double-float 73)
   (prepare-for-fast-read-byte *fasl-file*
     (prog1
@@ -807,7 +805,7 @@
 	  (complex re im))
       (done-with-fast-read-byte))))
 
-#+(and complex-float long-float)
+#+long-float
 (define-fop (fop-complex-long-float 67)
   (prepare-for-fast-read-byte *fasl-file*
     (prog1
@@ -944,21 +942,19 @@
 		  (* length vm:word-bytes #+x86 3 #+sparc 4))
     result))
 
-#+complex-float
 (define-fop (fop-complex-single-float-vector 86)
   (let* ((length (read-arg 4))
 	 (result (make-array length :element-type '(complex single-float))))
     (read-n-bytes *fasl-file* result 0 (* length vm:word-bytes 2))
     result))
 
-#+complex-float
 (define-fop (fop-complex-double-float-vector 87)
   (let* ((length (read-arg 4))
 	 (result (make-array length :element-type '(complex double-float))))
     (read-n-bytes *fasl-file* result 0 (* length vm:word-bytes 2 2))
     result))
 
-#+(and complex-float long-float)
+#+long-float
 (define-fop (fop-complex-long-float-vector 89)
   (let* ((length (read-arg 4))
 	 (result (make-array length :element-type '(complex long-float))))
@@ -1005,7 +1001,6 @@
 ;;;
 ;;; Same as FOP-INT-VECTOR, except this is for signed simple-arrays.
 ;;; It appears that entry 50 and 51 are clear.
-#+signed-array
 (define-fop (fop-signed-int-vector 50)
   (prepare-for-fast-read-byte *fasl-file*
     (let* ((len (fast-read-u-integer 4))
@@ -1025,7 +1020,6 @@
       res)))
 
 ;;; Same as fop-uniform-int-vector, but for signed integers
-#+signed-array
 (define-fop (fop-uniform-signed-int-vector 51)
    (prepare-for-fast-read-byte *fasl-file*
      (let* ((n (fast-read-u-integer 4))
diff --git a/code/numbers.lisp b/code/numbers.lisp
index 8baf9f733f256a818c306c601de57183bdb5f313..d0f5b19c25948fba6cb4d94cb7aa3f8dab6dc874 100644
--- a/code/numbers.lisp
+++ b/code/numbers.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.33 1998/03/21 08:12:01 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.34 1998/07/24 17:17:54 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -221,7 +221,6 @@
 (defun canonical-complex (realpart imagpart)
   (if (eql imagpart 0)
       realpart
-      #+complex-float
       (cond #+long-float
 	    ((and (typep realpart 'long-float)
 		  (typep imagpart 'long-float))
@@ -233,9 +232,7 @@
 		  (typep imagpart 'single-float))
 	     (truly-the (complex single-float) (complex realpart imagpart)))
 	    (t
-	     (%make-complex realpart imagpart)))
-      #-complex-float
-      (%make-complex realpart imagpart)))
+	     (%make-complex realpart imagpart)))))
 
 
 ;;; BUILD-RATIO  --  Internal
@@ -268,14 +265,6 @@
 
 ;;;; Complexes:
 
-#-complex-float
-(defun upgraded-complex-part-type (spec)
-  "Returns the element type of the most specialized COMPLEX number type that
-   can hold parts of type Spec.  This is currently always T."
-  (declare (ignore spec))
-  t)
-
-#+complex-float
 (defun upgraded-complex-part-type (spec)
   "Returns the element type of the most specialized COMPLEX number type that
    can hold parts of type Spec."
@@ -290,15 +279,6 @@
 	 'rational)
 	(t)))
 
-#-complex-float
-(defun complex (realpart &optional (imagpart 0))
-  "Builds a complex number from the specified components."
-  (number-dispatch ((realpart real) (imagpart real))
-    ((rational rational)
-     (canonical-complex realpart imagpart))
-    (float-contagion %make-complex realpart imagpart (rational))))
-
-#+complex-float
 (defun complex (realpart &optional (imagpart 0))
   "Builds a complex number from the specified components."
   (flet ((%%make-complex (realpart imagpart)
@@ -322,17 +302,6 @@
      (canonical-complex realpart imagpart))
     (float-contagion %%make-complex realpart imagpart (rational)))))
 
-#-complex-float
-(defun realpart (number)
-  "Extracts the real part of a number."
-  (realpart number))
-
-#-complex-float
-(defun imagpart (number)
-  "Extracts the imaginary part of a number."
-  (imagpart number))
-
-#+complex-float
 (defun realpart (number)
   "Extracts the real part of a number."
   (typecase number
@@ -348,7 +317,6 @@
     (t
      number)))
 
-#+complex-float
 (defun imagpart (number)
   "Extracts the imaginary part of a number."
   (typecase number
@@ -642,8 +610,7 @@
     ((ratio)
      (%make-ratio (- (numerator n)) (denominator n)))
     ((complex)
-     #+complex-float (complex (- (realpart n)) (- (imagpart n)))
-     #-complex-float (%make-complex (- (realpart n)) (- (imagpart n))))))
+     (complex (- (realpart n)) (- (imagpart n))))))
 
 
 ;;;; Truncate & friends.
diff --git a/code/pred.lisp b/code/pred.lisp
index 5b5c42c95a25814b8fe84c22a04264fa452855da..e079fcefcb5ca350021a63168b5dfb8138de625f 100644
--- a/code/pred.lisp
+++ b/code/pred.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.48 1998/05/01 01:02:56 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.49 1998/07/24 17:17:54 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -54,11 +54,11 @@
       consp
       compiled-function-p
       complexp
-      #+complex-float complex-double-float-p
-      #+complex-float complex-float-p
-      #+(and complex-float long-float) complex-long-float-p
-      #+complex-float complex-rational-p
-      #+complex-float complex-single-float-p
+      complex-double-float-p
+      complex-float-p
+      #+long-float complex-long-float-p
+      complex-rational-p
+      complex-single-float-p
       double-float-p
       fdefn-p
       fixnump
@@ -94,16 +94,16 @@
       simple-array-unsigned-byte-8-p
       simple-array-unsigned-byte-16-p
       simple-array-unsigned-byte-32-p
-      #+signed-array simple-array-signed-byte-8-p
-      #+signed-array simple-array-signed-byte-16-p
-      #+signed-array simple-array-signed-byte-30-p
-      #+signed-array simple-array-signed-byte-32-p
+      simple-array-signed-byte-8-p
+      simple-array-signed-byte-16-p
+      simple-array-signed-byte-30-p
+      simple-array-signed-byte-32-p
       simple-array-single-float-p
       simple-array-double-float-p
       #+long-float simple-array-long-float-p
-      #+complex-float simple-array-complex-single-float-p
-      #+complex-float simple-array-complex-double-float-p
-      #+(and complex-float long-float) simple-array-complex-long-float-p
+      simple-array-complex-single-float-p
+      simple-array-complex-double-float-p
+      #+long-float simple-array-complex-long-float-p
       dylan::dylan-function-p
       )))
 
@@ -131,7 +131,7 @@
 ;;; 
 (defun type-of (object)
   "Return the type of OBJECT."
-  (if (typep object '(or function array #+complex-float complex))
+  (if (typep object '(or function array complex))
       (type-specifier (ctype-of object))
       (let* ((class (layout-class (layout-of object)))
 	     (name (class-name class)))
diff --git a/code/room.lisp b/code/room.lisp
index 0b19c081bfff7a6673968d6acd5d815f05424e40..767d6bd7d039b8754bcdfb4d042327377d3d6d44 100644
--- a/code/room.lisp
+++ b/code/room.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/room.lisp,v 1.26 1997/11/01 22:58:20 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/room.lisp,v 1.27 1998/07/24 17:17:55 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -84,14 +84,14 @@
 		 (simple-array-unsigned-byte-8-type . 0)
 		 (simple-array-unsigned-byte-16-type . 1)
 		 (simple-array-unsigned-byte-32-type . 2)
-		 #+signed-array (simple-array-signed-byte-8-type . 0)
-		 #+signed-array (simple-array-signed-byte-16-type . 1)
-		 #+signed-array (simple-array-signed-byte-30-type . 2)
-		 #+signed-array (simple-array-signed-byte-32-type . 2)
+		 (simple-array-signed-byte-8-type . 0)
+		 (simple-array-signed-byte-16-type . 1)
+		 (simple-array-signed-byte-30-type . 2)
+		 (simple-array-signed-byte-32-type . 2)
 		 (simple-array-single-float-type . 2)
 		 (simple-array-double-float-type . 3)
-		 #+complex-float (simple-array-complex-single-float-type . 3)
-		 #+complex-float (simple-array-complex-double-float-type . 4)))
+		 (simple-array-complex-single-float-type . 3)
+		 (simple-array-complex-double-float-type . 4)))
   (let ((name (car stuff))
 	(size (cdr stuff)))
     (setf (svref *meta-room-info* (symbol-value name))
@@ -476,14 +476,14 @@
 	       #.simple-array-unsigned-byte-8-type
 	       #.simple-array-unsigned-byte-16-type
 	       #.simple-array-unsigned-byte-32-type
-	       #+signed-array #.simple-array-signed-byte-8-type
-	       #+signed-array #.simple-array-signed-byte-16-type
-	       #+signed-array #.simple-array-signed-byte-30-type
-	       #+signed-array #.simple-array-signed-byte-32-type
+	       #.simple-array-signed-byte-8-type
+	       #.simple-array-signed-byte-16-type
+	       #.simple-array-signed-byte-30-type
+	       #.simple-array-signed-byte-32-type
 	       #.simple-array-single-float-type
 	       #.simple-array-double-float-type
-	       #+complex-float #.simple-array-complex-single-float-type
-	       #+complex-float #.simple-array-complex-double-float-type)
+	       #.simple-array-complex-single-float-type
+	       #.simple-array-complex-double-float-type)
 	      (incf non-descriptor-headers)
 	      (incf non-descriptor-bytes (- size word-bytes)))
 	     ((#.list-pointer-type
diff --git a/code/stream.lisp b/code/stream.lisp
index b97a05fc5b21022766114d64c158291a65013154..74609ab47781285984663c6419df32a6622073c0 100644
--- a/code/stream.lisp
+++ b/code/stream.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/stream.lisp,v 1.34 1998/07/16 13:30:52 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/stream.lisp,v 1.35 1998/07/24 17:17:55 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1683,7 +1683,7 @@
        (with-array-data ((data seq) (offset-start start) (offset-end end))
 	 (typecase data
 	   ((or (simple-array (unsigned-byte 8) (*))
-		#+signed-array (simple-array (signed-byte 8) (*))
+		(simple-array (signed-byte 8) (*))
 		simple-string)
 	    (let* ((numbytes (- end start))
 		   (bytes-read (system:read-n-bytes