diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 9b2947ac976..099a22a3afd 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -2896,12 +2896,12 @@ bool TraceRecorder::record_JSOP_CALLGVAR()
 
 bool TraceRecorder::record_JSOP_CALLVAR()
 {
-    return false;
+    return record_JSOP_GETVAR();
 }
 
 bool TraceRecorder::record_JSOP_CALLARG()
 {
-    return false;
+    return record_JSOP_GETARG();
 }
 
 bool TraceRecorder::record_JSOP_CALLLOCAL()
diff --git a/js/src/trace-test.js b/js/src/trace-test.js
index 137883893ba..d37cbe4ee3e 100644
--- a/js/src/trace-test.js
+++ b/js/src/trace-test.js
@@ -135,15 +135,15 @@ function ursh(n)
 test("ursh", [ursh(8),ursh(33),ursh(0),ursh(1)],
      "16777215,2147483620,4294967241,2147483620");
 
-// pass Math as an argument until JSOP_NAME works again
-function doMath(Math)
+function doMath(cos)
 {
     var s = 0;
+    var sin = Math.sin;
     for (var i = 0; i < 200; i++)
-      s = -Math.pow(Math.sin(i) + Math.cos(i * 0.75), 4);
+        s = -Math.pow(sin(i) + cos(i * 0.75), 4);
     return s;
 }
-test("Math.sin/cos/pow", doMath(Math), -0.5405549555611059);
+test("Math.sin/cos/pow", doMath(Math.cos), -0.5405549555611059);
 
 function unknownCall(Math)
 {
@@ -209,4 +209,4 @@ function mod()
   }
   return mods.toString();
 }
-test("mod", mod(), "4.5,0,42,4,NaN");
\ No newline at end of file
+test("mod", mod(), "4.5,0,42,4,NaN");