diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp
index 782c3230134..3f807e02d7d 100644
--- a/js/src/nanojit/Assembler.cpp
+++ b/js/src/nanojit/Assembler.cpp
@@ -155,7 +155,6 @@ namespace nanojit
         : hasLoop(0)
         , codeList(0)
         , alloc(alloc)
-        , core(core)
         , _codeAlloc(codeAlloc)
         , config(core->config)
     {
@@ -741,19 +740,18 @@ namespace nanojit
         verbose_only(_thisfrag->compileNbr++; )
         _inExit = false;
 
-        GC* gc = core->gc;
         LabelStateMap labels(alloc);
-        NInsMap patches(_gc);
+        NInsMap patches(alloc);
         gen(prev, loopJumps, labels, patches);
         frag->loopEntry = _nIns;
         //nj_dprintf(stderr, "assemble frag %X entry %X\n", (int)frag, (int)frag->fragEntry);
 
         if (!error()) {
             // patch all branches
-            while (!patches.isEmpty())
-            {
-                NIns* where = patches.lastKey();
-                LInsp targ = patches.removeLast();
+            NInsMap::Iter iter(patches);
+            while (iter.next()) {
+                NIns* where = iter.key();
+                LIns* targ = iter.value();
                 LabelState *label = labels.get(targ);
                 NIns* ntarg = label->addr;
                 if (ntarg) {
diff --git a/js/src/nanojit/Assembler.h b/js/src/nanojit/Assembler.h
index 32ae440b3d8..fea452c74ff 100644
--- a/js/src/nanojit/Assembler.h
+++ b/js/src/nanojit/Assembler.h
@@ -112,8 +112,7 @@ namespace nanojit
     };
 
     typedef avmplus::List<NIns*, avmplus::LIST_NonGCObjects> NInsList;
-    typedef avmplus::SortedMap<LIns*,NIns*,avmplus::LIST_NonGCObjects> InsMap;
-    typedef avmplus::SortedMap<NIns*,LIns*,avmplus::LIST_NonGCObjects> NInsMap;
+    typedef HashMap<NIns*, LIns*> NInsMap;
 
     class LabelState
     {
@@ -240,7 +239,6 @@ namespace nanojit
             }
 
             Allocator           &alloc;
-            AvmCore             *core;
             CodeAlloc&          _codeAlloc;
             avmplus::GC*        _gc;
             DWB(Fragment*)      _thisfrag;