diff --git a/include/xo/interpreter2/interpreter2_register_primitives.hpp b/include/xo/interpreter2/interpreter2_register_primitives.hpp
index 5d3f0fb1..b2e1063b 100644
--- a/include/xo/interpreter2/interpreter2_register_primitives.hpp
+++ b/include/xo/interpreter2/interpreter2_register_primitives.hpp
@@ -11,8 +11,9 @@
 namespace xo {
     namespace scm {
         /** Register primitive-factories **/
-        bool interpreter2_register_primitives(obj<xo::mm::AAllocator> gc,
-                                              StringTable * stbl,
+        bool interpreter2_register_primitives(obj<ARuntimeContext> rcx,
+                                              //xo::mm::AAllocator> gc,
+                                              //StringTable * stbl,
                                               InstallSink sink,
                                               InstallFlags flags);
     }
diff --git a/src/interpreter2/interpreter2_register_primitives.cpp b/src/interpreter2/interpreter2_register_primitives.cpp
index f0da9a8e..dba9337c 100644
--- a/src/interpreter2/interpreter2_register_primitives.cpp
+++ b/src/interpreter2/interpreter2_register_primitives.cpp
@@ -51,16 +51,22 @@ namespace xo {
         }
 
         bool
-        interpreter2_register_primitives(obj<xo::mm::AAllocator> mm,
-                                         StringTable * stbl,
+        interpreter2_register_primitives(obj<ARuntimeContext> rcx,
+                                         //obj<xo::mm::AAllocator> mm,
+                                         //StringTable * stbl,
                                          InstallSink sink,
                                          InstallFlags flags)
         {
             scope log(XO_DEBUG(true));
 
+            obj<AAllocator> mm = rcx.allocator();
+            StringTable * stbl = rcx.stringtable();
+
             bool ok = true;
 
-            ok = ok & install_aux(sink, VsmPrimitives::make_report_memory_use_pm(mm, stbl), flags);
+            ok = ok & install_aux(sink,
+                                  VsmPrimitives::make_report_memory_use_pm(mm, stbl),
+                                  flags);
 
             return ok;
         }