Index: /trunk/ccl/level-1/l1-clos-boot.lisp
===================================================================
--- /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 419)
+++ /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 420)
@@ -2128,7 +2128,7 @@
 	      (return))))))))
 
-(defmethod create-reader-method-function ((class std-class)
+(defmethod create-reader-method-function ((class slots-class)
 					  (reader-method-class standard-reader-method)
-					  (dslotd standard-direct-slot-definition))
+					  (dslotd direct-slot-definition))
   (gvector :function
            (uvref *reader-method-function-proto* 0)
@@ -2138,7 +2138,7 @@
            (dpb 1 $lfbits-numreq (ash 1 $lfbits-method-bit))))
 
-(defmethod create-writer-method-function ((class std-class)
+(defmethod create-writer-method-function ((class slots-class)
 					  (writer-method-class standard-writer-method)
-					  (dslotd standard-direct-slot-definition))
+					  (dslotd direct-slot-definition))
   (gvector :function
            (uvref *writer-method-function-proto* 0)
@@ -2763,8 +2763,8 @@
 ; This is part of the MOP
 ;;; Maybe it was, at one point in the distant past ...
-(defmethod class-slot-initargs ((class std-class))
+(defmethod class-slot-initargs ((class slots-class))
   (apply #'append (mapcar #'(lambda (s)
-                              (standard-slot-definition.initargs s))
-                          (%class.slots class))))
+                              (%slot-definition-initargs s))
+                          (%class-slots class))))