diff --git a/pcl/defclass.lisp b/pcl/defclass.lisp
index 7deda0fde1796b9837a7b7f0f089cbd2f287d158..d6d5126b6f3465905770bacbf06b03277bb0b526 100644
--- a/pcl/defclass.lisp
+++ b/pcl/defclass.lisp
@@ -26,7 +26,7 @@
 ;;;
 #+cmu
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/defclass.lisp,v 1.12 1998/12/20 04:30:18 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/defclass.lisp,v 1.13 1999/01/12 17:51:08 pw Exp $")
 ;;;
 
 (in-package :pcl)
@@ -142,18 +142,24 @@
 
 (defun expand-defclass (name supers slots options)
   (declare (special *defclass-times* *boot-state* *the-class-structure-class*))
-  (setq supers  (copy-tree supers)
+  (setq supers  (nsubstitute 'standard-class 'lisp:standard-class
+			     (copy-tree supers))
 	slots   (copy-tree slots)
 	options (copy-tree options))
   (let ((metaclass 'standard-class))
+    ;; TBD - ANSI compliant class and slot option checking.
     (dolist (option options)
       (if (not (listp option))
-          (error "~S is not a legal defclass option." option)
+          (error 'simple-program-error
+		 :format-control "~S is not a legal defclass option."
+		 :format-arguments (list option))
           (when (eq (car option) ':metaclass)
             (unless (legal-class-name-p (cadr option))
-              (error "The value of the :metaclass option (~S) is not a~%~
-                      legal class name."
-                     (cadr option)))
+              (error 'simple-program-error
+		     :format-control 
+		     "The value of the :metaclass option (~S) is not a~%~
+		      legal class name."
+		     :format-arguments (list (cadr option))))
 	    #-cmu17
             (setq metaclass (cadr option))
 	    #+cmu17
diff --git a/pcl/std-class.lisp b/pcl/std-class.lisp
index 860a06a0dec2a8a9ee1a7520d9a10c94f2397ada..bf11822080c67198663819ab354f1da672beb11c 100644
--- a/pcl/std-class.lisp
+++ b/pcl/std-class.lisp
@@ -26,7 +26,7 @@
 ;;;
 #+cmu
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/std-class.lisp,v 1.20 1999/01/06 14:30:07 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/std-class.lisp,v 1.21 1999/01/12 17:51:09 pw Exp $")
 ;;;
 
 (in-package :pcl)
@@ -379,10 +379,6 @@
 	     (cond ((classp s) s)
 		   ((not (legal-class-name-p s))
 		    (error "~S is not a class or a legal class name." s))
-	#||notyet   #+cmu17
-		   ((eq s 'lisp:standard-class) ; map from lisp to pcl
-		    *the-class-standard-class*)
-	 ||#
 		   (t
 		    (or (find-class s nil)
 			(setf (find-class s)