Index: /trunk/source/level-1/l1-clos.lisp
===================================================================
--- /trunk/source/level-1/l1-clos.lisp	(revision 15265)
+++ /trunk/source/level-1/l1-clos.lisp	(revision 15266)
@@ -1993,5 +1993,5 @@
                          (eq (instance.class-wrapper instance) wrapper)))
              (%slot-ref (instance.slots instance) location))
-            (t (no-applicable-method (car (%gf-dispatch-table-gf dt)) instance))))))
+            (t (no-applicable-method (method-generic-function (car (%gf-dispatch-table-methods dt))) instance))))))
 (register-dcode-proto #'singleton-reader-dcode *gf-proto-one-arg*)
 
@@ -2005,5 +2005,5 @@
               (%svref dt %gf-dispatch-table-first-data))
       (%slot-ref (instance.slots instance) (%svref dt (1+ %gf-dispatch-table-first-data)))
-      (no-applicable-method (car (%gf-dispatch-table-gf dt)) instance)))
+      (no-applicable-method (method-generic-function (car (%gf-dispatch-table-methods dt))) instance)))
 (register-dcode-proto #'reader-constant-location-dcode *gf-proto-one-arg*)
 
@@ -2027,5 +2027,5 @@
              (not (eql 0 (sbit bits defining-class-ordinal))))
       (%slot-ref (instance.slots instance) (%svref dt (1+ %gf-dispatch-table-first-data)))
-      (no-applicable-method (car (%gf-dispatch-table-gf dt)) instance))))
+      (no-applicable-method (method-generic-function (car (%gf-dispatch-table-methods dt))) instance))))
 (register-dcode-proto #'reader-constant-location-inherited-from-single-class-dcode *gf-proto-one-arg*)
 
@@ -2084,5 +2084,5 @@
             (return t)))
       (%slot-ref (instance.slots instance) (%svref dt (1+ %gf-dispatch-table-first-data)))
-      (no-applicable-method (car (%gf-dispatch-table-gf dt)) instance))))
+      (no-applicable-method (method-generic-function (car (%gf-dispatch-table-methods dt))) instance))))
 (register-dcode-proto #'reader-constant-location-inherited-from-multiple-classes-dcode *gf-proto-one-arg*)
 
@@ -2100,5 +2100,5 @@
     (if location
       (%slot-ref (instance.slots instance) location)
-      (no-applicable-method (car (%gf-dispatch-table-gf dt)) instance))))
+      (no-applicable-method (method-generic-function (car (%gf-dispatch-table-methods dt))) instance))))
 (register-dcode-proto #'reader-variable-location-dcode *gf-proto-one-arg*)
 
@@ -2170,5 +2170,5 @@
                   (unless (< argnum 0)
                     (setf (%gf-dispatch-table-argnum dt) (lognot argnum)
-                          (%gf-dispatch-table-gf dt) (cons f (%gf-dcode f)))))
+                          (%gf-dispatch-table-gf dt) (%gf-dcode f))))
                     
                 (cond ((null (cdr alist))
@@ -2568,5 +2568,5 @@
            (argnum (%gf-dispatch-table-argnum dt)))
       (when (< argnum 0)
-        (let* ((dcode (cdr (%gf-dispatch-table-gf dt))))
+        (let* ((dcode (%gf-dispatch-table-gf dt)))
           (setf (%gf-dispatch-table-argnum dt) (lognot argnum)
                 (%gf-dispatch-table-gf dt) f