diff --git a/whalesong/js-assembler/assemble.rkt b/whalesong/js-assembler/assemble.rkt
index 37d7273..67705aa 100644
--- a/whalesong/js-assembler/assemble.rkt
+++ b/whalesong/js-assembler/assemble.rkt
@@ -65,7 +65,6 @@
     (display (assemble-current-interned-constant-closure-table) op)
     
     (display "M.params.currentErrorHandler = fail;\n" op)
-    (display "M.params.currentSuccessHandler = success;\n" op)
     (display  #<<EOF
 for (param in params) {
     if (Object.hasOwnProperty.call(params, param)) {
@@ -80,6 +79,7 @@ EOF
                     (assemble-label (make-Label (BasicBlock-name (first basic-blocks)))))]
           [else
            ;; Otherwise, we want to run under a trampolining context.
+           (display "M.c.push(new RT.Closure(function(M){ console.log('calling success'); setTimeout(success, 0); },RT.makeArityAtLeast(0),void(0),'toplevel'));\n" op)
            (fprintf op "M.trampoline(~a, ~a); })"
                     (assemble-label (make-Label (BasicBlock-name (first basic-blocks))))
                     (cond [(eq? trampoline-option 'with-preemption)
diff --git a/whalesong/js-assembler/runtime-src/runtime.js b/whalesong/js-assembler/runtime-src/runtime.js
index 19ecde8..842e730 100644
--- a/whalesong/js-assembler/runtime-src/runtime.js
+++ b/whalesong/js-assembler/runtime-src/runtime.js
@@ -297,7 +297,6 @@
 	    'currentOutputPort': new StandardOutputPort(),
 	    'currentErrorPort': new StandardErrorPort(),
             'currentInputPort': new StandardInputPort(),
-	    'currentSuccessHandler': function(MACHINE) {},
 	    'currentErrorHandler': function(MACHINE, exn) {
                 MACHINE.params.currentErrorDisplayer(
                     MACHINE,
@@ -720,9 +719,10 @@
                 }
             }
         }
+
+        console.log('evaluation terminated');
         that.running = false;
         that.breakScheduled = false;
-        that.params.currentSuccessHandler(that);
         release();
         return;