diff --git a/code/debug-int.lisp b/code/debug-int.lisp
index 36be8c4cca6cf51642117c55abbfb7d0597e44f2..ff809f17628cd6d96599b436cd83ed8dd48f0b82 100644
--- a/code/debug-int.lisp
+++ b/code/debug-int.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.61 1993/07/24 01:45:08 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.62 1993/08/30 21:19:40 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -17,7 +17,7 @@
 ;;; Written by Bill Chiles and Rob Maclachlan.
 ;;;
 
-(in-package "DEBUG-INTERNALS" :nicknames '("DI"))
+(in-package "DEBUG-INTERNALS")
 
 
 ;;; The compiler's debug-source structure is almost exactly what we want, so
@@ -108,7 +108,8 @@
 	     (write-line "No debugging information available." stream))))
 
 (define-condition no-debug-function-returns (debug-condition)
-  (debug-function)
+  ((debug-function :reader no-debug-function-returns-debug-function
+		   :initarg :debug-function))
   (:documentation
    "The system could not return values from a frame with debug-function since
     it lacked information about returning values.")
@@ -122,21 +123,24 @@
 		       fun)))))
 
 (define-condition no-debug-blocks (debug-condition)
-  (debug-function)
+  ((debug-function :reader no-debug-blocks-debug-function
+		   :initarg :debug-function))
   (:documentation "The debug-function has no debug-block information.")
   (:report (lambda (condition stream)
 	     (format stream "~&~S has no debug-block information."
 		     (no-debug-blocks-debug-function condition)))))
 
 (define-condition no-debug-variables (debug-condition)
-  (debug-function)
+  ((debug-function :reader no-debug-variables-debug-function
+		   :initarg :debug-function))
   (:documentation "The debug-function has no debug-variable information.")
   (:report (lambda (condition stream)
 	     (format stream "~&~S has no debug-variable information."
 		     (no-debug-variables-debug-function condition)))))
 
 (define-condition lambda-list-unavailable (debug-condition)
-  (debug-function)
+  ((debug-function :reader lambda-list-unavailable-debug-function
+		   :initarg :debug-function))
   (:documentation
    "The debug-function has no lambda-list since argument debug-variables are
     unavailable.")
@@ -145,16 +149,17 @@
 		     (lambda-list-unavailable-debug-function condition)))))
 
 (define-condition invalid-value (debug-condition)
-  ((debug-variable)
-   (frame))
+  ((debug-variable :reader invalid-value-debug-variable
+		   :initarg :debug-variable)
+   (frame :reader invalid-value-frame :initarg :frame))
   (:report (lambda (condition stream)
 	     (format stream "~&~S has :invalid or :unknown value in ~S."
 		     (invalid-value-debug-variable condition)
 		     (invalid-value-frame condition)))))
 
 (define-condition ambiguous-variable-name (debug-condition)
-  ((name)
-   (frame))
+  ((name :reader ambiguous-variable-name-name :initarg :name)
+   (frame :reader ambiguous-variable-name-frame :initarg :frame))
   (:report (lambda (condition stream)
 	     (format stream "~&~S names more than one valid variable in ~S."
 		     (ambiguous-variable-name-name condition)
@@ -177,20 +182,23 @@
     tools inherit from this type."))
 
 (define-condition unhandled-condition (debug-error)
-  ((condition))
+  ((condition :reader unhandled-condition-condition :initarg :condition))
   (:report (lambda (condition stream)
 	     (format stream "~&Unhandled debug-condition:~%~A"
 		     (unhandled-condition-condition condition)))))
 
 (define-condition unknown-code-location (debug-error)
-  ((code-location))
+  ((code-location :reader unknown-code-location-code-location
+		  :initarg :code-location))
   (:report (lambda (condition stream)
 	     (format stream "~&Invalid use of an unknown code-location -- ~S."
 		     (unknown-code-location-code-location condition)))))
 
 (define-condition unknown-debug-variable (debug-error)
-  ((debug-variable)
-   (debug-function))
+  ((debug-variable :reader unknown-debug-variable-debug-variable
+		   :initarg :debug-variable)
+   (debug-function :reader unknown-debug-variable-debug-function
+		   :initarg :debug-function))
   (:report (lambda (condition stream)
 	     (format stream "~&~S not in ~S."
 		     (unknown-debug-variable-debug-variable condition)
@@ -204,9 +212,10 @@
 	     (write-string "Invalid control stack pointer." stream))))
 
 (define-condition frame-function-mismatch (debug-error)
-  ((code-location)
-   (frame)
-   (form))
+  ((code-location :reader frame-function-mismatch-code-location
+		  :initarg :code-location)
+   (frame :reader frame-function-mismatch-frame :initarg :frame)
+   (form :reader frame-function-mismatch-form :initarg :form))
   (:report (lambda (condition stream)
 	     (format stream
 		     "~&Form was preprocessed for ~S,~% but called on ~S:~%  ~S"
diff --git a/code/defmacro.lisp b/code/defmacro.lisp
index 5bb923ac5fba2ced2f5029119746aeeccec33d19..72a68bd8c589e4b269f822a6e2533694cdc2f36a 100644
--- a/code/defmacro.lisp
+++ b/code/defmacro.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defmacro.lisp,v 1.15 1993/08/19 17:14:14 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defmacro.lisp,v 1.16 1993/08/30 21:19:50 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -324,14 +324,16 @@
 
 ;;;; Conditions signaled at runtime by the resultant body.
 
-(define-condition defmacro-lambda-list-bind-error (error) (kind name))
+(define-condition defmacro-lambda-list-bind-error (error)
+  ((kind :reader defmacro-lambda-list-bind-error-kind :initarg :kind)
+   (name :reader defmacro-lambda-list-bind-error-name :initarg :name)))
 
 (defun print-defmacro-ll-bind-error-intro (condition stream)
   (if (null (defmacro-lambda-list-bind-error-name condition))
       (format stream
 	      "Error while parsing arguments to ~A in ~S:~%"
 	      (defmacro-lambda-list-bind-error-kind condition)
-	      (defmacro-lambda-list-bind-error-function-name condition))
+	      (condition-function-name condition))
       (format stream
 	      "Error while parsing arguments to ~A ~S:~%"
 	      (defmacro-lambda-list-bind-error-kind condition)
@@ -339,7 +341,9 @@
 
 (define-condition defmacro-bogus-sublist-error
 		  (defmacro-lambda-list-bind-error)
-  (object lambda-list)
+  ((object :reader defmacro-bogus-sublist-error-object :initarg :object)
+   (lambda-list :reader defmacro-bogus-sublist-error-lambda-list
+		:initarg :lambda-list))
   (:report
    (lambda (condition stream)
      (print-defmacro-ll-bind-error-intro condition stream)
@@ -349,7 +353,11 @@
 	     (defmacro-bogus-sublist-error-lambda-list condition)))))
 
 (define-condition defmacro-ll-arg-count-error (defmacro-lambda-list-bind-error)
-  (argument lambda-list minimum maximum)
+  ((argument :reader defmacro-ll-arg-count-error-argument :initarg :argument)
+   (lambda-list :reader defmacro-ll-arg-count-error-lambda-list
+		:initarg :lambda-list)
+   (minimum :reader defmacro-ll-arg-count-error-minimum :initarg :minimum)
+   (maximum :reader defmacro-ll-arg-count-error-maximum :initarg :maximum))
   (:report
    (lambda (condition stream)
      (print-defmacro-ll-bind-error-intro condition stream)
@@ -375,7 +383,9 @@
 
 (define-condition defmacro-ll-broken-key-list-error
 		  (defmacro-lambda-list-bind-error)
-  (problem info)
+  ((problem :reader defmacro-ll-broken-key-list-error-problem
+	    :initarg :problem)
+   (info :reader defmacro-ll-broken-key-list-error-info :initarg :info))
   (:report (lambda (condition stream)
 	     (print-defmacro-ll-bind-error-intro condition stream)
 	     (format stream
diff --git a/code/fd-stream.lisp b/code/fd-stream.lisp
index 074fde5fae089280667d753e614753a83cb6f246..0e99f0b442b74a8e0287c35c05f593b371d66d20 100644
--- a/code/fd-stream.lisp
+++ b/code/fd-stream.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.30 1993/08/04 12:26:25 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.31 1993/08/30 21:19:53 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -116,7 +116,8 @@
 	  (fd-stream-name fd-stream)))
 
 
-(define-condition io-timeout (stream-error) (direction)
+(define-condition io-timeout (stream-error)
+  ((direction :reader io-timeout-direction :initarg :direction))
   (:report
    (lambda (condition stream)
      (declare (stream stream))
diff --git a/code/format.lisp b/code/format.lisp
index c5d270c58093cab285f92d1a8c4620ecead850fc..9f46c26ed913b79daa5f08e747f9c906e82e1e90 100644
--- a/code/format.lisp
+++ b/code/format.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.27 1993/03/14 14:05:00 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.28 1993/08/30 21:19:57 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -62,14 +62,17 @@
 (defvar *default-format-error-offset* nil)
 
 (define-condition format-error (error)
-  ((complaint)
-   (arguments :init-form nil)
-   (control-string :init-form *default-format-error-control-string*)
-   (offset :init-form *default-format-error-offset*)
-   (print-banner :init-form t))
+  ((complaint :reader format-error-complaint :initarg :complaint)
+   (arguments :reader format-error-arguments :initarg :arguments :initform nil)
+   (control-string :reader format-error-control-string
+		   :initarg :control-string
+		   :initform *default-format-error-control-string*) 
+   (offset :reader format-error-offset :initarg :offset
+	   :initform *default-format-error-offset*)
+   (print-banner :reader format-error-print-banner :initarg :print-banner
+		 :initform t))
   (:report %print-format-error))
 
-
 
 ;;;; TOKENIZE-CONTROL-STRING
 
diff --git a/code/lispinit.lisp b/code/lispinit.lisp
index b3ffbe184ea3874f19e5bd669d2063bb0de0b846..3557592b0018cb70457ba249b6e480939bd72cf8 100644
--- a/code/lispinit.lisp
+++ b/code/lispinit.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/lispinit.lisp,v 1.42 1993/08/26 15:27:56 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/lispinit.lisp,v 1.43 1993/08/30 21:20:02 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -179,12 +179,12 @@
     (let ((condition (coerce-to-condition datum arguments
 					  'simple-error 'error))
 	  (debug:*stack-top-hint* debug:*stack-top-hint*))
-      (unless (and (error-function-name condition) debug:*stack-top-hint*)
+      (unless (and (condition-function-name condition) debug:*stack-top-hint*)
 	(multiple-value-bind
 	    (name frame)
 	    (kernel:find-caller-name)
-	  (unless (error-function-name condition)
-	    (setf (error-function-name condition) name))
+	  (unless (condition-function-name condition)
+	    (setf (condition-function-name condition) name))
 	  (unless debug:*stack-top-hint*
 	    (setf debug:*stack-top-hint* frame))))
       (let ((debug:*stack-top-hint* nil))
@@ -203,12 +203,13 @@
 			   (coerce-to-condition datum arguments
 						'simple-error 'error)))
 	    (debug:*stack-top-hint* debug:*stack-top-hint*))
-	(unless (and (error-function-name condition) debug:*stack-top-hint*)
+	(unless (and (condition-function-name condition)
+		     debug:*stack-top-hint*)
 	  (multiple-value-bind
 	      (name frame)
 	      (kernel:find-caller-name)
-	    (unless (error-function-name condition)
-	      (setf (error-function-name condition) name))
+	    (unless (condition-function-name condition)
+	      (setf (condition-function-name condition) name))
 	    (unless debug:*stack-top-hint*
 	      (setf debug:*stack-top-hint* frame))))
 	(with-condition-restarts condition (list (find-restart 'continue))
diff --git a/code/pathname.lisp b/code/pathname.lisp
index d60cfa83d15d6150de8aa59f72fb8b7f6868a32f..7bc67d91bb53b510baad58832978bb85f248c520 100644
--- a/code/pathname.lisp
+++ b/code/pathname.lisp
@@ -6,7 +6,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.23 1993/08/15 14:44:31 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.24 1993/08/30 21:20:05 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -740,10 +740,11 @@
 	  (namestring-parse-error-offset condition)))
 
 (define-condition namestring-parse-error (parse-error)
-  ((complaint :init-form (required-argument))
-   (arguments :init-form nil)
-   (namestring :init-form (required-argument))
-   (offset :init-form (required-argument)))
+  ((complaint :reader namestring-parse-error-complaint :initarg :complaint)
+   (arguments :reader namestring-parse-error-arguments :initarg :arguments
+	      :initform nil)
+   (namestring :reader namestring-parse-error-namestring :initarg :namestring)
+   (offset :reader namestring-parse-error-offset :initarg :offset))
   (:report %print-namestring-parse-error))
 
 
diff --git a/code/print.lisp b/code/print.lisp
index 79d5f70b0cb54a47ae145a25665759816a45f52f..26422fca6c296384ddf98f22860d5a0f4b4da007 100644
--- a/code/print.lisp
+++ b/code/print.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/print.lisp,v 1.62 1993/08/30 14:55:09 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/print.lisp,v 1.63 1993/08/30 21:20:54 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -245,7 +245,8 @@
 				  `#'(lambda () ,@body)
 				  nil)))
 
-(define-condition print-not-readable (error) (object)
+(define-condition print-not-readable (error)
+  ((object :reader print-not-readable-object :initarg :object))
   (:report
    (lambda (condition stream)
     (format stream "~S cannot be printed readably."
diff --git a/code/reader.lisp b/code/reader.lisp
index 591c6177a2980252eb0b7913fc390fcc0a42ab8c..6c7976f29ea759bc0d1f63409e94b660ae16568e 100644
--- a/code/reader.lisp
+++ b/code/reader.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.18 1993/08/25 01:14:41 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/reader.lisp,v 1.19 1993/08/30 21:20:10 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -44,16 +44,14 @@
 
 ;;;; Reader errors:
 
-(define-condition reader-error (stream-error)
-  (format-control
-   (format-arguments :init-form ()))
+(define-condition reader-error (simple-condition stream-error) ()
   (:report
    (lambda (condition stream)
      (let ((error-stream (stream-error-stream condition)))
        (format stream "Reader error ~@[at ~D ~]on ~S:~%~?"
 	       (file-position error-stream) error-stream
-	       (reader-error-format-control condition)
-	       (reader-error-format-arguments condition))))))
+	       (simple-condition-format-control condition)
+	       (simple-condition-format-arguments condition))))))
 
 (define-condition reader-package-error (reader-error))
 
@@ -66,7 +64,7 @@
 	 :format-arguments args))
 
 (define-condition reader-eof-error (end-of-file)
-  (context)
+  ((context :reader reader-eof-error-context :initarg :context))
   (:report
    (lambda (condition stream)
      (format stream "Unexpected EOF on ~S ~A."
diff --git a/code/typedefs.lisp b/code/typedefs.lisp
index 5db383df456796704e2b421b6b24f117e296df2f..30399c92128e6bc37f2be6593c85eaeaa69181b6 100644
--- a/code/typedefs.lisp
+++ b/code/typedefs.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/typedefs.lisp,v 1.5 1993/02/23 11:32:30 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/typedefs.lisp,v 1.6 1993/08/30 21:20:13 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -59,7 +59,7 @@
 ;;; compiler warnings can be emitted as appropriate.
 ;;;
 (define-condition parse-unknown-type (condition)
-  (specifier))
+  ((specifier :reader parse-unknown-type-specifier :initarg :specifier)))
 
 
 ;;;; Cold load hack magic.
diff --git a/code/wire.lisp b/code/wire.lisp
index d7daa7512f78e24d0fab05007e9e62c13d325300..c971f6a6371bf2db3320e18912d4acfd8a70e43e 100644
--- a/code/wire.lisp
+++ b/code/wire.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/wire.lisp,v 1.9 1992/05/15 17:51:43 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/wire.lisp,v 1.10 1993/08/30 21:20:15 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -103,7 +103,7 @@
   id)
 
 (define-condition wire-error (error)
-  (wire)
+  ((wire :reader wire-error-wire :initarg :wire))
   (:report (lambda (condition stream)
 	     (format stream "There is a problem with ~A."
 		     (wire-error-wire condition)))))
@@ -112,15 +112,15 @@
   ()
   (:report (lambda (condition stream)
 	     (format stream "Recieved EOF on ~A."
-		     (wire-eof-wire condition)))))
+		     (wire-error-wire condition)))))
 
 (define-condition wire-io-error (wire-error)
-  ((when :init-form "using")
-   (msg :init-form "Failed."))
+  ((when :reader wire-io-error-when :initarg :when :initform "using")
+   (msg :reader wire-io-error-msg :initarg :msg :initform "Failed."))
   (:report (lambda (condition stream)
 	     (format stream "Error ~A ~A: ~A."
 		     (wire-io-error-when condition)
-		     (wire-io-error-wire condition)
+		     (wire-error-wire condition)
 		     (wire-io-error-msg condition)))))