Index: /trunk/ccl/lib/macros.lisp
===================================================================
--- /trunk/ccl/lib/macros.lisp	(revision 273)
+++ /trunk/ccl/lib/macros.lisp	(revision 274)
@@ -1626,5 +1626,5 @@
 			(duplicate-options slot)
 			(setq type-p t))
-                      (when (null (cadr options)) (signal-program-error "Illegal options ~S" options))
+                      ;(when (null (cadr options)) (signal-program-error "Illegal options ~S" options))
                       (setq type (cadr options)))
                      (:initform
@@ -1672,10 +1672,8 @@
 		,@(mapcar #'(lambda (s) `(note-function-info ',s nil ,env))
 			  signatures)))
-	    (progn
-	      (record-source-file ',class-name 'class)
-	      (ensure-class ',class-name
+	      (ensure-class-for-defclass ',class-name
 			    :direct-superclasses ',direct-superclasses
 			    :direct-slots ,`(list ,@direct-slot-specs)
-			    ,@other-options))))))))
+			    ,@other-options)))))))
 
 (defmacro define-method-combination (name &rest rest &environment env)
@@ -1711,5 +1709,5 @@
         options methods option-keywords method-class)
     (flet ((bad-option (o)
-             (error "Bad option: ~s to ~s." o 'defgeneric)))
+             (signal-program-error "Bad option: ~s to ~s." o 'defgeneric)))
       (dolist (o options-and-methods)
         (let ((keyword (car o))
@@ -1718,5 +1716,5 @@
             (push `(,defmethod ,function-name ,@(%cdr o)) methods)
             (cond ((memq keyword (prog1 option-keywords (push keyword option-keywords)))
-                   (error "Duplicate option: ~s to ~s" keyword 'defgeneric))
+                   (signal-program-error "Duplicate option: ~s to ~s" keyword 'defgeneric))
                   ((eq keyword :method-name)    ; used by generic-flet
                    (if function-name (bad-option o))
@@ -2441,5 +2439,5 @@
 
 ; I wanted to call this ":method"
-(defmacro method (gf &rest qualifiers-and-specializers)
+(defmacro reference-method (gf &rest qualifiers-and-specializers)
   (let ((qualifiers (butlast qualifiers-and-specializers))
         (specializers (car (last qualifiers-and-specializers))))