 
 (defconst factor--regex-single-liner
   (format "^%s" (regexp-opt '("DEFER:" "GENERIC:" "IN:"
-                              "PRIVATE>" "<PRIVATE" "SYMBOL:" "USE:"))))
+                              "PRIVATE>" "<PRIVATE"
+                              "SINGLETON:" "SYMBOL:" "USE:" "VAR:"))))
 
 (defconst factor--regex-begin-of-def
   (format "^USING: \\|\\(%s\\)\\|\\(%s .*\\)"

;;; Factor mode syntax:

(defconst factor--regex-definition-starters
  (regexp-opt '("TUPLE" "MACRO" "MACRO:" "M" ":" "")))

(defconst factor--regex-definition-start
  (format "^\\(%s:\\) " factor--regex-definition-starters))

(defvar factor-mode-map (make-sparse-keymap)
  "Key map used by Factor mode.")

(defsubst factor--beginning-of-defun (&optional times)
  (re-search-backward factor--regex-begin-of-def nil t times))

(defsubst factor--end-of-defun ()
