diff --git a/haskell-cabal.el b/haskell-cabal.el
index f8dd89968..1819f5bdb 100644
--- a/haskell-cabal.el
+++ b/haskell-cabal.el
@@ -34,7 +34,6 @@
 
 ;; (defun haskell-cabal-extract-fields-from-doc ()
 ;;   (require 'xml)
-;;   (with-no-warnings (require 'cl))
 ;;   (let ((section (completing-read
 ;;                   "Section: "
 ;;                   '("general-fields" "library" "executable" "buildinfo"))))
@@ -43,8 +42,8 @@
 ;;   (let* ((xml (xml-parse-region
 ;;                (progn (search-forward "<variablelist>") (match-beginning 0))
 ;;                (progn (search-forward "</variablelist>") (point))))
-;;          (varlist (remove-if-not 'consp (cddar xml)))
-;;          (syms (mapcar (lambda (entry) (caddr (assq 'literal (assq 'term entry))))
+;;          (varlist (cl-remove-if-not 'consp (cl-cddar xml)))
+;;          (syms (mapcar (lambda (entry) (cl-caddr (assq 'literal (assq 'term entry))))
 ;;                        varlist))
 ;;          (fields (mapcar (lambda (sym) (substring-no-properties sym 0 -1)) syms)))
 ;;     fields))
diff --git a/haskell-doc.el b/haskell-doc.el
index 58afda0aa..8207d364d 100644
--- a/haskell-doc.el
+++ b/haskell-doc.el
@@ -300,8 +300,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
-
 (require 'haskell-mode)
 (require 'haskell-process)
 (require 'haskell)
@@ -1539,18 +1537,14 @@ If SYNC is non-nil, make the call synchronously instead."
       (if sync
           (let ((response (haskell-process-queue-sync-request process ghci-command)))
             (funcall callback (funcall process-response response)))
-        (lexical-let ((process process)
-                      (callback callback)
-                      (ghci-command ghci-command)
-                      (process-response process-response))
-          (haskell-process-queue-command
-           process
-           (make-haskell-command
-            :go (lambda (_) (haskell-process-send-string process ghci-command))
-            :complete
-            (lambda (_ response)
-              (funcall callback (funcall process-response response))))))
-        'async))))
+        (haskell-process-queue-command
+         process
+         (make-haskell-command
+          :go (lambda (_) (haskell-process-send-string process ghci-command))
+          :complete
+          (lambda (_ response)
+            (funcall callback (funcall process-response response))))))
+      'async)))
 
 (defun haskell-doc-sym-doc (sym)
   "Show the type of given symbol SYM.