diff --git a/latex.el b/latex.el
index 46acae0..611e65a 100644
--- a/latex.el
+++ b/latex.el
@@ -730,20 +730,20 @@ environment in commented regions with the same comment prefix.
 The functions `LaTeX-find-matching-begin' and `LaTeX-find-matching-end'
 work analogously."
   (setq arg (if arg (if (< arg 1) 1 arg) 1))
-  (let* ((in-comment (TeX-in-commented-line))
+  (let* ((in-comment (TeX-in-comment))
 	 (comment-prefix (and in-comment (TeX-comment-prefix))))
     (save-excursion
       (while (and (/= arg 0)
 		  (re-search-backward
 		   "\\\\\\(begin\\|end\\) *{ *\\([A-Za-z*]+\\) *}" nil t))
 	(when (or (and LaTeX-syntactic-comments
-		       (eq in-comment (TeX-in-commented-line))
+		       (eq in-comment (TeX-in-comment))
 		       (or (not in-comment)
 			   ;; Consider only matching prefixes in the
 			   ;; commented case.
 			   (string= comment-prefix (TeX-comment-prefix))))
 		  (and (not LaTeX-syntactic-comments)
-		       (not (TeX-in-commented-line))))
+		       (not (TeX-in-comment))))
 	  (setq arg (if (string= (match-string 1) "end") (1+ arg) (1- arg)))))
       (if (/= arg 0)
 	  "document"
@@ -2378,14 +2378,16 @@ non-parenthetical delimiters, like \\verb+foo+, are recognized."
 
 (defun LaTeX-verbatim-p (&optional pos)
   "Return non-nil if position POS is in a verbatim-like construct."
-  (when pos (goto-char pos))
+  (if pos (goto-char pos))
   (save-match-data
-    (or (when (fboundp 'font-latex-faces-present-p)
-	  (font-latex-faces-present-p 'font-latex-verbatim-face))
-	(member (LaTeX-current-verbatim-macro)
-		(LaTeX-verbatim-macros-with-delims))
-	(member (TeX-current-macro) (LaTeX-verbatim-macros-with-braces))
-	(member (LaTeX-current-environment) (LaTeX-verbatim-environments)))))
+    ;; If `font-latex-faces-present-p' is available use only it, this is much
+    ;; faster than next test.
+    (if (fboundp 'font-latex-faces-present-p)
+	(font-latex-faces-present-p 'font-latex-verbatim-face)
+      (or (member (LaTeX-current-verbatim-macro)
+		  (LaTeX-verbatim-macros-with-delims))
+	  (member (TeX-current-macro) (LaTeX-verbatim-macros-with-braces))
+	  (member (LaTeX-current-environment) (LaTeX-verbatim-environments))))))
 
 
 ;;; Formatting
@@ -3713,7 +3715,7 @@ environment in commented regions with the same comment prefix."
   (interactive)
   (let* ((regexp (concat (regexp-quote TeX-esc) "\\(begin\\|end\\)\\b"))
 	 (level 1)
-	 (in-comment (TeX-in-commented-line))
+	 (in-comment (TeX-in-comment))
 	 (comment-prefix (and in-comment (TeX-comment-prefix))))
     (save-excursion
       (skip-chars-backward "a-zA-Z \t{")
@@ -3724,13 +3726,13 @@ environment in commented regions with the same comment prefix."
 	     (setq level 0))))
     (while (and (> level 0) (re-search-forward regexp nil t))
       (when (or (and LaTeX-syntactic-comments
-		     (eq in-comment (TeX-in-commented-line))
+		     (eq in-comment (TeX-in-comment))
 		     ;; If we are in a commented line, check if the
 		     ;; prefix matches the one we started out with.
 		     (or (not in-comment)
 			 (string= comment-prefix (TeX-comment-prefix))))
 		(and (not LaTeX-syntactic-comments)
-		     (not (TeX-in-commented-line))))
+		     (not (TeX-in-comment))))
 	(if (= (char-after (1+ (match-beginning 0))) ?b) ;;begin
 	    (setq level (1+ level))
 	  (setq level (1- level)))))
@@ -3747,7 +3749,7 @@ environment in commented regions with the same comment prefix."
   (interactive)
   (let* ((regexp (concat (regexp-quote TeX-esc) "\\(begin\\|end\\)\\b"))
 	 (level 1)
-	 (in-comment (TeX-in-commented-line))
+	 (in-comment (TeX-in-comment))
 	 (comment-prefix (and in-comment (TeX-comment-prefix))))
     (skip-chars-backward "a-zA-Z \t{")
     (unless (bolp)
@@ -3757,13 +3759,13 @@ environment in commented regions with the same comment prefix."
 	   (setq level 0)))
     (while (and (> level 0) (re-search-backward regexp nil t))
       (when (or (and LaTeX-syntactic-comments
-		     (eq in-comment (TeX-in-commented-line))
+		     (eq in-comment (TeX-in-comment))
 		     ;; If we are in a commented line, check if the
 		     ;; prefix matches the one we started out with.
 		     (or (not in-comment)
 			 (string= comment-prefix (TeX-comment-prefix))))
 		(and (not LaTeX-syntactic-comments)
-		     (not (TeX-in-commented-line))))
+		     (not (TeX-in-comment))))
 	(if (= (char-after (1+ (match-beginning 0))) ?e) ;;end
 	    (setq level (1+ level))
 	  (setq level (1- level)))))
diff --git a/tex.el b/tex.el
index bb7b067..9748da7 100644
--- a/tex.el
+++ b/tex.el
@@ -4436,7 +4436,7 @@ Brace insertion is only done if point is in a math construct and
 A mode-specific implementation is required.  If it is not
 available, the function always returns nil."
   (when TeX-verbatim-p-function
-    (funcall TeX-verbatim-p-function)))
+    (funcall TeX-verbatim-p-function pos)))
 
 
 ;;; Comments