       "is_function" "is_integer" "is_list" "is_map" "is_number" "is_pid"
       "is_port" "is_record" "is_reference" "is_tuple")
     "LFE type tests")
-  (defconst lfe-type-bifs
+  (defconst lfe-type-forms
     '("abs" "bit_size" "byte_size" "element" "float"
       "hd" "iolist_size" "length" "make_ref" "setelement" ;"size"
       "round" "tl" "trunc" "tuple_size"

      "\\(\\sw+\\)?")
     '(1 font-lock-keyword-face)
     '(3 font-lock-type-face nil t)))
  "LFE new style type expressions.")

(defconst lfe-font-lock-new-function-keywords
  (eval-when-compile
    (list
     (concat
      ;; No method here!
      "(\\(def\\(un\\|macro\\|syntax\\|test\\)\\)\\>"
      ;; Any whitespace and declared object.
      "[ \t]*(?"
      "\\(\\sw+\\)?")
     '(1 font-lock-keyword-face)
     '(3 font-lock-function-name-face nil t)))
  "LFE new style function expressions.")

(defconst lfe-font-lock-flavor-keywords
  (eval-when-compile
    (list
     (concat
      "(\\(defflavor\\|defmethod\\|endflavor\\)\\>"
      ;; Any whitespace and declared object.
      "[ \t]*(?"
      "\\(\\sw+\\)?")
     '(1 font-lock-keyword-face)
     '(2 font-lock-type-face nil t)))
  "LFE flavor expressions.")

(defconst lfe-font-lock-keywords-1
  (eval-when-compile
    (list lfe-font-lock-new-type-keywords
          lfe-font-lock-new-function-keywords
          lfe-font-lock-basic-type-keywords
          lfe-font-lock-basic-function-keywords
          lfe-font-lock-flavor-keywords))
  "Subdued expressions to highlight in LFE modes.")

(eval-and-compile

      "\\(\\sw+\\)?")
     '(1 font-lock-keyword-face)
     '(3 font-lock-type-face nil t)))
  "LFE old type definition forms.")

(defconst lfe-font-lock-old-function-keywords
  (eval-when-compile
    (list
     (concat
