   "\\_<\"[^>]\\([^\"\n]\\|\\\\\"\\)*\n")
 
 (defconst factor-word-definition-regex
-  (format "\\_<\\(%s\\)?[:#] +\\(%s\\)"
-          (regexp-opt
-           '(":" "GENERIC" "DEFER" "HOOK" "MACRO" "MATH" "POSTPONE"
-             "PRIMITIVE" "SYNTAX" "TYPED" "TYPED:"))
-          "\\(\\sw\\|\\s_\\|\\s(\\|\\s)\\)+"))
+  (concat
+   (format "\\_<\\(\\(?:%s\\)?[:#]\\)"
+           (regexp-opt
+            '(":" "GENERIC" "DEFER" "HOOK" "MACRO" "MATH" "POSTPONE"
+              "PRIMITIVE" "SYNTAX" "TYPED" "TYPED:")))
+   ws+ symbol))
 
 ;; [parsing-word] [vocab-word]
 (defconst factor-vocab-ref-regex
-  (syntax-and-1-symbol
-   '("IN" "USE" "EXCLUDE" "QUALIFIED" "QUALIFIED-WITH")))
+  (syntax-and-1-symbol '("IN" "USE" "QUALIFIED")))
 
 (defconst factor-using-lines-regex
   (concat (syntax-begin '("USING")) ws+ symbols-to-semicolon))

    "B" "BEFORE:"
    "C-GLOBAL:" "C-TYPE:" "CHAR:" "COLOR:" "COM-INTERFACE:"
    "CONSULT:" "call-next-method"
    "DEFER:"
    "EBNF:" ";EBNF" "ENUM:" "ERROR:"
    "FOREIGN-ATOMIC-TYPE:" "FOREIGN-ENUM-TYPE:" "FOREIGN-RECORD-TYPE:" "FUNCTION-ALIAS:"
    "GAME:" "GENERIC#" "GENERIC:" "GIR:"
    "GLSL-SHADER:" "GLSL-PROGRAM:"
    "HINTS:" "HOOK:"
    "initial:" "INTERSECTION:" "IMPLEMENT-STRUCTS:"
    "M:" "M::" "MACRO:" "MACRO::" "MATH:"
    "MEMO:" "MEMO:" "METHOD:" "MIXIN:"
    "NAN:"
    "POSTPONE:" "PRIMITIVE:" "PRIVATE>" "PROTOCOL:" "PROVIDE:"
    "read-only" "REQUIRE:"  "REQUIRES:"
    "SINGLETON:" "SINGLETONS:" "SLOT:" "SPECIALIZED-ARRAY:"
    "SPECIALIZED-ARRAYS:" "STRING:" "SYNTAX:"


(defconst factor-alias-regex
  (syntax-and-2-symbols '("ALIAS")))

(defconst factor-qualified-with-regex
  (syntax-and-2-symbols '("QUALIFIED-WITH")))

(defconst factor-c-global-regex
  (format "\\_<C-GLOBAL: +%s +%s\\( .*\\)?$" symbol symbol))
