   ([repl-env env filename form]
     (evaluate-form repl-env env filename form identity))
   ([repl-env env filename form wrap]
-    (evaluate-form repl-env env filename form wrap nil))
+    (evaluate-form repl-env env filename form wrap *repl-opts*))
   ([repl-env env filename form wrap opts]
     (try
       (binding [ana/*cljs-file* filename]

                                     :undeclared-var warn-on-undeclared
                                     :undeclared-ns warn-on-undeclared
                                     :undeclared-ns-form warn-on-undeclared)
               ana/*cljs-static-fns* static-fns]
       ;; TODO: the follow should become dead code when the REPL is
       ;; sufficiently enhanced to understand :cache-analysis - David
       (let [env {:context :expr :locals {}}

              :success (:value ret)))))
      (catch Throwable ex
        (.printStackTrace ex)
        ((:print opts) (str ex))
        ((:flush opts))))))

(defn load-stream [repl-env filename res]
  (let [env (ana/empty-env)]
