diff --git a/lisp/image-file.el b/lisp/image-file.el
index 87fd48a55f2..13a2eeb591e 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -156,10 +156,6 @@ Optional argument ARGS are the arguments to call FUNCTION with."
     (apply function args)))
 
 
-;;; Note this definition must be at the end of the file, because
-;;; `define-minor-mode' actually calls the mode-function if the
-;;; associated variable is non-nil, which requires that all needed
-;;; functions be already defined.  [This is arguably a bug in d-m-m]
 ;;;###autoload
 (define-minor-mode auto-image-file-mode
   "Toggle visiting of image files as images.
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 73f88f4b4a5..47caf02b03a 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -384,7 +384,7 @@ Signal an error if the entire string was not used."
   (let* ((read-data (read-from-string str))
 	 (more-left 
 	  (condition-case nil
-	      ;; The call to `ignore' suppresses a warning.
+	      ;; The call to `ignore' suppresses a compiler warning.
 	      (progn (ignore (read-from-string (substring str (cdr read-data))))
 		     t)
 	    (end-of-file nil))))