diff --git a/whalesong/compiler/compiler.rkt b/whalesong/compiler/compiler.rkt
index 5356546..0b8907e 100644
--- a/whalesong/compiler/compiler.rkt
+++ b/whalesong/compiler/compiler.rkt
@@ -100,16 +100,12 @@
       
      handle-multiple-return:
      ;; After coming back from the evaluation, rearrange the return
-     ;; values as a list.
+     ;; values, to call the continuation with those as arguments.
      (make-TestAndJump (make-TestZero (make-Reg 'argcount)) 
                        bundle-values-into-list:)
      handle-return:
      (make-PushImmediateOntoEnvironment (make-Reg 'val) #f)     
      bundle-values-into-list:
-     (make-Perform (make-UnspliceRestFromStack! 
-                    (make-Const 0) (make-Reg 'argcount)))
-     (make-AssignImmediate 'val (make-EnvLexicalReference 0 #f))
-     (make-PopEnvironment (make-Const 1) (make-Const 0))
      (make-Goto (make-Label last:))
      
      ;; FIXME: missing the abort handler.  if we abort, we want the
diff --git a/whalesong/repl-prototype/htdocs/repl.js b/whalesong/repl-prototype/htdocs/repl.js
index d4667ad..1d60cbd 100644
--- a/whalesong/repl-prototype/htdocs/repl.js
+++ b/whalesong/repl-prototype/htdocs/repl.js
@@ -166,10 +166,14 @@
                          // Indirect eval usage here is deliberate.
                          var codeFunction = (0,eval)(code);
                          var onGoodEvaluation = function() {
-                             var resultList = that.M.v;
-                             while(resultList !== plt.baselib.lists.EMPTY) {
-                                 print(that, resultList.first);
-                                 resultList = resultList.rest;
+                             var resultCount = that.M.a;
+                             var results = [];
+                             var i;
+                             for (i = 0; i < resultCount; i++) {
+                                 results.push(that.M.e[that.M.e.length - 1 - i]);
+                             }
+                             for (i = 0; i < results.length; i++) {
+                                 print(that, results[i]);
                              };
                              k();
                          };