                         (let ((package-name (buffer-local-value 'intero-package-name buffer)))
                           (unless (equal "" package-name)
                             (list package-name))))
-                    t)))
+                    intero-repl-no-build
+                    intero-repl-no-load)))
     (insert (propertize
              (format "Starting:\n  stack ghci %s\n" (combine-and-quote-strings arguments))
              'face 'font-lock-comment-face))

    (message "Intero mode is now %s on all future Haskell buffers."
             (if intero-global-mode
                 "enabled" "disabled"))))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Buffer-local variables/state

  (flycheck-mode)
  (flycheck-buffer))

(defun intero-make-options-list (targets no-build no-load)
  "Make the stack ghci options list."
  (append (list "--with-ghc"
                "intero"
                "--docker-run-args=--interactive=true --tty=false"
                )
          (when no-build
            (list "--no-build"))
          (when no-load
            (list "--no-load"))
          (let ((dir (make-temp-file "intero" t)))
            (list "--ghci-options"
                  (concat "-odir=" dir)
