 
 ;;; Code
 
-(require 'cc-mode)
-(require 'font-lock)
-(require 'newcomment)
-(require 'thingatpt)
+(eval-and-compile
+  (require 'cc-mode)
+  (require 'font-lock)
+  (require 'newcomment)
+  (require 'thingatpt))
 
 (eval-when-compile
-  (require 'cl))
-
-(declaim (optimize (speed 0) (safety 3))) ; XXX: change for release
+  (require 'cl)
+  (proclaim '(optimize (speed 0) (safety 3))))
 
 ;;; Constants
 

    ;; Highlights parent class, in parts, if available
    (espresso--class-decl-matcher
     ,(concat "\\(" espresso--name-re "\\)\\(?:\\.\\|.*$\\)")
     (goto-char (or (match-beginning 2) (point-at-eol)))
     nil
     (1 font-lock-type-face))

    ;; Highlights parent class


   (cdr pitem)))

(defun espresso--maybe-make-marker (location)
  "Make LOCATION into a marker if imenu-use-markers"
  (if imenu-use-markers
      (set-marker (make-marker) location)
    location))

(defun espresso--pitems-to-imenu (pitems unknown-ctr)
  "Convert list of pitems PITEMS to imenu format"
