diff --git a/js-assembler/runtime-src/baselib-primitives.js b/js-assembler/runtime-src/baselib-primitives.js
index 81367e4..6dc5d8e 100644
--- a/js-assembler/runtime-src/baselib-primitives.js
+++ b/js-assembler/runtime-src/baselib-primitives.js
@@ -2195,14 +2195,11 @@
         'current-continuation-marks',
         makeList(0, 1),
         function(M) {
-            var promptTag;
+            var promptTag = baselib.contmarks.DEFAULT_CONTINUATION_PROMPT_TAG;
             if (M.a === 1) {
                 promptTag = checkContinuationPromptTag(M, 'current-continuation-marks', 0);
             }
             var contMarks = M.captureContinuationMarks(promptTag);
-            // The continuation marks shouldn't capture the record of the call to
-            // current-continuation-marks itself.
-            contMarks.shift();
             return contMarks;
         });
 
@@ -2212,7 +2209,7 @@
         function(M) {
             var marks = checkContinuationMarkSet(M, 'continuation-mark-set->list', 0);
             var key = checkAny(M, 'continuation-mark-set->list', 1);
-            var promptTag;
+            var promptTag = baselib.contmarks.DEFAULT_CONTINUATION_PROMPT_TAG;
             if (M.a === 3) {
                 promptTag = checkContinuationPromptTag(M, 'current-continuation-marks', 2);
             }
diff --git a/js-assembler/runtime-src/runtime.js b/js-assembler/runtime-src/runtime.js
index 9f17547..639d80d 100644
--- a/js-assembler/runtime-src/runtime.js
+++ b/js-assembler/runtime-src/runtime.js
@@ -307,14 +307,14 @@
     // Try to get the continuation mark key used for procedure application tracing.
     var getTracedAppKey = function(MACHINE) {
         if (MACHINE.modules['whalesong/lang/private/traced-app.rkt']) {
-            return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-app-key'];
+            return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-app-key'] || 'traced-app-key';
         }
         return undefined;
     };
 
     var getTracedCalleeKey = function(MACHINE) {
         if (MACHINE.modules['whalesong/lang/private/traced-app.rkt']) {
-            return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-callee-key'];
+            return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-callee-key'] || 'traced-callee-key';
         }
         return undefined;
     };
diff --git a/version.rkt b/version.rkt
index 2e59647..823b499 100644
--- a/version.rkt
+++ b/version.rkt
@@ -7,4 +7,4 @@
 (provide version)
 (: version String)
 
-(define version "1.137")
+(define version "1.142")