   (let ((match-data (match-data))
 	continue)
     (or (catch 'exit
-	  (while (re-real-search-forward *pjs-vars-with-members-or-methods* end t)
+	  (while (re-search-forward *pjs-vars-with-members-or-methods* end t)
 	    (save-match-data
 	      (let* ((member   (downcase (match-string-no-properties 1)))
 		     (var-type (get-variable-type-in-context (match-beginning 0))))

(defun search-pjs-current-namespace-functions (end)
  (let* ((namespace (pjs-current-namespace))
	 (ns-functions (list-pjs-namespace-functions-regexp namespace)))
    (re-real-search-forward (format "\\(?:%s\\.\\)?%s" namespace ns-functions) end t)))

(defun search-pjs-current-namespace-variables (end)
  (let* ((namespace (pjs-current-namespace))
	 (ns-variables (list-pjs-namespace-variables-regexp namespace)))
    (re-real-search-forward (format "\\(?:%s\\.\\)?%s" namespace ns-variables) end t)))

(defun search-pjs-current-namespace-classes (end)
  (let* ((namespace (pjs-current-namespace))
	 (ns-classes (list-pjs-namespace-classes-regexp namespace)))
    (re-real-search-forward (format "\\(?:%s\\.\\)?%s" namespace ns-classes) end t)))

(defun init-pjs-namespace-cache ()
  (unless (hash-table-p *pjs-namespace-functions-cache*)    

  (push (list *pjs-class-definition* 1 font-lock-type-face) font-locks)
  
  ;; New type
  ;; (push (list *pjs-new-type-regexp* 1 font-lock-type-face) font-locks)

  ;; symbols
  (push (list *pjs-symbols* 0 font-lock-preprocessor-face) font-locks)  
    
  ;; Function definition
  (push (list *pjs-function-heading* 1 font-lock-function-name-face) font-locks)
  ;; Function arguments
