diff --git a/js/src/methodjit/PunboxAssembler.h b/js/src/methodjit/PunboxAssembler.h
index 36630bcf0da..4098a7f6ac1 100644
--- a/js/src/methodjit/PunboxAssembler.h
+++ b/js/src/methodjit/PunboxAssembler.h
@@ -404,14 +404,6 @@ class PunboxAssembler : public JSC::MacroAssembler
         }
         return notHole;
     }
-
-    /* :FIXME: borrowed from patch in bug 594247 */
-    void breakDouble(FPRegisterID srcDest, RegisterID typeReg, RegisterID dataReg) {
-        m_assembler.movq_rr(srcDest, typeReg);
-        move(Registers::PayloadMaskReg, dataReg);
-        andPtr(typeReg, dataReg);
-        xorPtr(dataReg, typeReg);
-    }
 };
 
 typedef PunboxAssembler ValueAssembler;
diff --git a/js/src/methodjit/TypedArrayIC.h b/js/src/methodjit/TypedArrayIC.h
index cb580de683f..c17fac6f188 100644
--- a/js/src/methodjit/TypedArrayIC.h
+++ b/js/src/methodjit/TypedArrayIC.h
@@ -455,13 +455,13 @@ StoreToTypedArray(JSContext *cx, Assembler &masm, js::TypedArray *tarray, T addr
 
             RegisterID newReg;
             if (!avail.empty()) {
-                newReg = avail.takeAnyReg();
+                newReg = avail.takeAnyReg().reg();
             } else {
                 // If no registers meet the ideal set, relax a constraint and spill.
                 avail = allowMask & ~pinned;
 
                 if (!avail.empty()) {
-                    newReg = avail.takeAnyReg();
+                    newReg = avail.takeAnyReg().reg();
                     saveRHS.preserve(Registers::maskReg(newReg));
                 } else {
                     // Oh no! *All* single byte registers are pinned. This