diff --git a/include/xo/interpreter2/DClosure.hpp b/include/xo/interpreter2/DClosure.hpp
index aef74663..e57f6a1a 100644
--- a/include/xo/interpreter2/DClosure.hpp
+++ b/include/xo/interpreter2/DClosure.hpp
@@ -58,7 +58,7 @@ namespace xo {
             ///@{
 
             std::size_t shallow_size() const noexcept;
-            DClosure * shallow_move(obj<AAllocator> mm) const noexcept;
+            DClosure * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             ///@}
diff --git a/include/xo/interpreter2/DLocalEnv.hpp b/include/xo/interpreter2/DLocalEnv.hpp
index 76cac024..6ecd3eb6 100644
--- a/include/xo/interpreter2/DLocalEnv.hpp
+++ b/include/xo/interpreter2/DLocalEnv.hpp
@@ -55,7 +55,7 @@ namespace xo {
             ///@{
 
             std::size_t shallow_size() const noexcept;
-            DLocalEnv * shallow_move(obj<AAllocator> mm) const noexcept;
+            DLocalEnv * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             ///@}
diff --git a/include/xo/interpreter2/DVsmApplyClosureFrame.hpp b/include/xo/interpreter2/DVsmApplyClosureFrame.hpp
index 718c52b3..ae422cb1 100644
--- a/include/xo/interpreter2/DVsmApplyClosureFrame.hpp
+++ b/include/xo/interpreter2/DVsmApplyClosureFrame.hpp
@@ -40,7 +40,7 @@ namespace xo {
 
             /** gcobject facet **/
             std::size_t shallow_size() const noexcept;
-            DVsmApplyClosureFrame * shallow_move(obj<AAllocator> mm) const noexcept;
+            DVsmApplyClosureFrame * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             /** pretty-printing support **/
diff --git a/include/xo/interpreter2/DVsmApplyFrame.hpp b/include/xo/interpreter2/DVsmApplyFrame.hpp
index d761cd18..99093f37 100644
--- a/include/xo/interpreter2/DVsmApplyFrame.hpp
+++ b/include/xo/interpreter2/DVsmApplyFrame.hpp
@@ -38,7 +38,7 @@ namespace xo {
             void assign_fn(obj<AGCObject> x) { this->fn_ = x; }
 
             std::size_t shallow_size() const noexcept;
-            DVsmApplyFrame * shallow_move(obj<AAllocator> mm) const noexcept;
+            DVsmApplyFrame * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             /** pretty-printing support **/
diff --git a/include/xo/interpreter2/DVsmDefContFrame.hpp b/include/xo/interpreter2/DVsmDefContFrame.hpp
index d128d357..0ad31cca 100644
--- a/include/xo/interpreter2/DVsmDefContFrame.hpp
+++ b/include/xo/interpreter2/DVsmDefContFrame.hpp
@@ -51,7 +51,7 @@ namespace xo {
             ///@{
 
             std::size_t shallow_size() const noexcept;
-            DVsmDefContFrame * shallow_move(obj<AAllocator> mm) noexcept;
+            DVsmDefContFrame * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             ///@}
diff --git a/include/xo/interpreter2/DVsmEvalArgsFrame.hpp b/include/xo/interpreter2/DVsmEvalArgsFrame.hpp
index c389f214..a1903e94 100644
--- a/include/xo/interpreter2/DVsmEvalArgsFrame.hpp
+++ b/include/xo/interpreter2/DVsmEvalArgsFrame.hpp
@@ -43,7 +43,7 @@ namespace xo {
             int32_t increment_arg() { return ++i_arg_; }
 
             std::size_t shallow_size() const noexcept;
-            DVsmEvalArgsFrame * shallow_move(obj<AAllocator> mm) const noexcept;
+            DVsmEvalArgsFrame * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             bool pretty(const ppindentinfo & ppii) const;
diff --git a/include/xo/interpreter2/DVsmIfElseContFrame.hpp b/include/xo/interpreter2/DVsmIfElseContFrame.hpp
index 09fcd076..3c438e51 100644
--- a/include/xo/interpreter2/DVsmIfElseContFrame.hpp
+++ b/include/xo/interpreter2/DVsmIfElseContFrame.hpp
@@ -51,7 +51,7 @@ namespace xo {
             ///@{
 
             std::size_t shallow_size() const noexcept;
-            DVsmIfElseContFrame * shallow_move(obj<AAllocator> mm) noexcept;
+            DVsmIfElseContFrame * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             ///@}
diff --git a/include/xo/interpreter2/DVsmSeqContFrame.hpp b/include/xo/interpreter2/DVsmSeqContFrame.hpp
index 4692425b..959edfb0 100644
--- a/include/xo/interpreter2/DVsmSeqContFrame.hpp
+++ b/include/xo/interpreter2/DVsmSeqContFrame.hpp
@@ -56,7 +56,7 @@ namespace xo {
             ///@{
 
             std::size_t shallow_size() const noexcept;
-            DVsmSeqContFrame * shallow_move(obj<AAllocator> mm) noexcept;
+            DVsmSeqContFrame * shallow_move(obj<ACollector> gc) noexcept;
             std::size_t forward_children(obj<ACollector> gc) noexcept;
 
             ///@}
diff --git a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
index f4a7c4d1..4cb21afa 100644
--- a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
+++ b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DVsmDefContFrame & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DVsmDefContFrame & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DVsmDefContFrame & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
index d5933283..86becbdf 100644
--- a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DClosure & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DClosure & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DClosure & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
index ab9e223a..01bef341 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DVsmApplyClosureFrame & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DVsmApplyClosureFrame & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DVsmApplyClosureFrame & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
index aa65d6e9..a3e0d31b 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DVsmApplyFrame & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DVsmApplyFrame & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DVsmApplyFrame & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
index 57d28ebe..42c26b03 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DVsmEvalArgsFrame & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DVsmEvalArgsFrame & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DVsmEvalArgsFrame & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
index 7105768a..55064b27 100644
--- a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
+++ b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DLocalEnv & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DLocalEnv & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DLocalEnv & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
index 63e3ad2a..ab9a13c8 100644
--- a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
+++ b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DVsmIfElseContFrame & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DVsmIfElseContFrame & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DVsmIfElseContFrame & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
index a657a217..d654d8a1 100644
--- a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
+++ b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DVsmSeqContFrame & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DVsmSeqContFrame & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DVsmSeqContFrame & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp b/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp
index ecaac469..fa9a6929 100644
--- a/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp
+++ b/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp
@@ -153,7 +153,7 @@ namespace xo {
             /** shallow copy during gc cycle.  Not implemented!  Only intending to support
              *  VSM as virtual root
              **/
-            DVirtualSchematikaMachine * shallow_move(obj<AAllocator> mm) const noexcept;
+            DVirtualSchematikaMachine * shallow_move(obj<ACollector> gc) noexcept;
 
             /** forward gc-aware child pointers
              **/
diff --git a/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp b/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp
index 6f7c0eb8..71786a28 100644
--- a/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp
+++ b/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp
@@ -55,7 +55,7 @@ namespace xo {
 
             // non-const methods
             /** move instance using allocator **/
-            static Opaque shallow_move(DVirtualSchematikaMachine & self, obj<AAllocator> mm) noexcept;
+            static Opaque shallow_move(DVirtualSchematikaMachine & self, obj<ACollector> gc) noexcept;
             /** during GC: forward immdiate children **/
             static size_type forward_children(DVirtualSchematikaMachine & self, obj<ACollector> gc) noexcept;
             ///@}
diff --git a/src/interpreter2/DClosure.cpp b/src/interpreter2/DClosure.cpp
index ed95334f..ca8f3bee 100644
--- a/src/interpreter2/DClosure.cpp
+++ b/src/interpreter2/DClosure.cpp
@@ -70,13 +70,8 @@ namespace xo {
         }
 
         DClosure *
-        DClosure::shallow_move(obj<AAllocator> mm) const noexcept {
-            DClosure * copy = (DClosure *)mm.alloc_copy((std::byte *)this);
-
-            if (copy)
-                *copy = *this;
-
-            return copy;
+        DClosure::shallow_move(obj<ACollector> gc) noexcept {
+            return gc.std_copy_for(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/DLocalEnv.cpp b/src/interpreter2/DLocalEnv.cpp
index 94f27422..a12200a0 100644
--- a/src/interpreter2/DLocalEnv.cpp
+++ b/src/interpreter2/DLocalEnv.cpp
@@ -97,13 +97,8 @@ namespace xo {
         }
 
         DLocalEnv *
-        DLocalEnv::shallow_move(obj<AAllocator> mm) const noexcept {
-            DLocalEnv * copy = (DLocalEnv *)mm.alloc_copy((std::byte *)this);
-
-            if (copy)
-                *copy = *this;
-
-            return copy;
+        DLocalEnv::shallow_move(obj<ACollector> gc) noexcept {
+            return gc.std_copy_for(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/DVirtualSchematikaMachine.cpp b/src/interpreter2/DVirtualSchematikaMachine.cpp
index a196363e..5ccb333c 100644
--- a/src/interpreter2/DVirtualSchematikaMachine.cpp
+++ b/src/interpreter2/DVirtualSchematikaMachine.cpp
@@ -954,11 +954,14 @@ namespace xo {
         }
 
         DVirtualSchematikaMachine *
-        DVirtualSchematikaMachine::shallow_move(obj<AAllocator> mm) const noexcept
+        DVirtualSchematikaMachine::shallow_move(obj<ACollector> gc) noexcept
         {
-            (void)mm;
+            (void)gc;
 
-            /** not copyable (because SchematikaReader isn't) **/
+            /** TODO: should be able to use gc.std_copy_for(this) now
+             *  that shallow_move uses move construction.
+             *  DVirtualSchematikaMachine is (or can be made) moveable.
+             **/
 
             assert(false);
 
diff --git a/src/interpreter2/DVsmApplyClosureFrame.cpp b/src/interpreter2/DVsmApplyClosureFrame.cpp
index d2cfdb35..c7dca412 100644
--- a/src/interpreter2/DVsmApplyClosureFrame.cpp
+++ b/src/interpreter2/DVsmApplyClosureFrame.cpp
@@ -39,15 +39,9 @@ namespace xo {
         }
 
         DVsmApplyClosureFrame *
-        DVsmApplyClosureFrame::shallow_move(obj<AAllocator> mm) const noexcept
+        DVsmApplyClosureFrame::shallow_move(obj<ACollector> gc) noexcept
         {
-            DVsmApplyClosureFrame * copy
-                = (DVsmApplyClosureFrame *)mm.alloc_copy((std::byte *)this);
-
-            if (copy)
-                *copy = *this;
-
-            return copy;
+            return gc.std_copy_for(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/DVsmApplyFrame.cpp b/src/interpreter2/DVsmApplyFrame.cpp
index 9a50c117..f51742f7 100644
--- a/src/interpreter2/DVsmApplyFrame.cpp
+++ b/src/interpreter2/DVsmApplyFrame.cpp
@@ -47,14 +47,9 @@ namespace xo {
         }
 
         DVsmApplyFrame *
-        DVsmApplyFrame::shallow_move(obj<AAllocator> mm) const noexcept
+        DVsmApplyFrame::shallow_move(obj<ACollector> gc) noexcept
         {
-            DVsmApplyFrame * copy = (DVsmApplyFrame *)mm.alloc_copy((std::byte *)this);
-
-            if (copy)
-                *copy = *this;
-
-            return copy;
+            return gc.std_copy_for(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/DVsmDefContFrame.cpp b/src/interpreter2/DVsmDefContFrame.cpp
index d1f3e2b2..f3a8b35b 100644
--- a/src/interpreter2/DVsmDefContFrame.cpp
+++ b/src/interpreter2/DVsmDefContFrame.cpp
@@ -38,9 +38,9 @@ namespace xo {
         }
 
         DVsmDefContFrame *
-        DVsmDefContFrame::shallow_move(obj<AAllocator> mm) noexcept
+        DVsmDefContFrame::shallow_move(obj<ACollector> gc) noexcept
         {
-            return mm.std_copy_for<DVsmDefContFrame>(this);
+            return gc.std_copy_for<DVsmDefContFrame>(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/DVsmEvalArgsFrame.cpp b/src/interpreter2/DVsmEvalArgsFrame.cpp
index 0ff4ceb2..c487ae59 100644
--- a/src/interpreter2/DVsmEvalArgsFrame.cpp
+++ b/src/interpreter2/DVsmEvalArgsFrame.cpp
@@ -48,15 +48,9 @@ namespace xo {
         }
 
         DVsmEvalArgsFrame *
-        DVsmEvalArgsFrame::shallow_move(obj<AAllocator> mm) const noexcept
+        DVsmEvalArgsFrame::shallow_move(obj<ACollector> gc) noexcept
         {
-            DVsmEvalArgsFrame * copy
-                = (DVsmEvalArgsFrame *)mm.alloc_copy((std::byte *)this);
-
-            if (copy)
-                *copy = *this;
-
-            return copy;
+            return gc.std_copy_for(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/DVsmIfElseContFrame.cpp b/src/interpreter2/DVsmIfElseContFrame.cpp
index 075f7bd3..4978ff9c 100644
--- a/src/interpreter2/DVsmIfElseContFrame.cpp
+++ b/src/interpreter2/DVsmIfElseContFrame.cpp
@@ -36,9 +36,9 @@ namespace xo {
         }
 
         DVsmIfElseContFrame *
-        DVsmIfElseContFrame::shallow_move(obj<AAllocator> mm) noexcept
+        DVsmIfElseContFrame::shallow_move(obj<ACollector> gc) noexcept
         {
-            return mm.std_copy_for<DVsmIfElseContFrame>(this);
+            return gc.std_copy_for<DVsmIfElseContFrame>(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/DVsmSeqContFrame.cpp b/src/interpreter2/DVsmSeqContFrame.cpp
index d6160e8d..7ffea82e 100644
--- a/src/interpreter2/DVsmSeqContFrame.cpp
+++ b/src/interpreter2/DVsmSeqContFrame.cpp
@@ -39,9 +39,9 @@ namespace xo {
         }
 
         DVsmSeqContFrame *
-        DVsmSeqContFrame::shallow_move(obj<AAllocator> mm) noexcept
+        DVsmSeqContFrame::shallow_move(obj<ACollector> gc) noexcept
         {
-            return mm.std_copy_for<DVsmSeqContFrame>(this);
+            return gc.std_copy_for<DVsmSeqContFrame>(this);
         }
 
         std::size_t
diff --git a/src/interpreter2/IGCObject_DClosure.cpp b/src/interpreter2/IGCObject_DClosure.cpp
index 33544907..99e834b8 100644
--- a/src/interpreter2/IGCObject_DClosure.cpp
+++ b/src/interpreter2/IGCObject_DClosure.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DClosure::shallow_move(DClosure & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DClosure::shallow_move(DClosure & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DClosure::forward_children(DClosure & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp b/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp
index 3aa994fd..a96ad2d7 100644
--- a/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp
+++ b/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DVsmApplyClosureFrame::shallow_move(DVsmApplyClosureFrame & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DVsmApplyClosureFrame::shallow_move(DVsmApplyClosureFrame & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DVsmApplyClosureFrame::forward_children(DVsmApplyClosureFrame & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/IGCObject_DVsmApplyFrame.cpp b/src/interpreter2/IGCObject_DVsmApplyFrame.cpp
index a1da32b8..9666fdec 100644
--- a/src/interpreter2/IGCObject_DVsmApplyFrame.cpp
+++ b/src/interpreter2/IGCObject_DVsmApplyFrame.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DVsmApplyFrame::shallow_move(DVsmApplyFrame & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DVsmApplyFrame::shallow_move(DVsmApplyFrame & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DVsmApplyFrame::forward_children(DVsmApplyFrame & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/IGCObject_DVsmDefContFrame.cpp b/src/interpreter2/IGCObject_DVsmDefContFrame.cpp
index 02abd4cb..2acd7b24 100644
--- a/src/interpreter2/IGCObject_DVsmDefContFrame.cpp
+++ b/src/interpreter2/IGCObject_DVsmDefContFrame.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DVsmDefContFrame::shallow_move(DVsmDefContFrame & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DVsmDefContFrame::shallow_move(DVsmDefContFrame & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DVsmDefContFrame::forward_children(DVsmDefContFrame & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp b/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp
index 8f33ece1..d1d6a0b6 100644
--- a/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp
+++ b/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DVsmEvalArgsFrame::shallow_move(DVsmEvalArgsFrame & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DVsmEvalArgsFrame::shallow_move(DVsmEvalArgsFrame & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DVsmEvalArgsFrame::forward_children(DVsmEvalArgsFrame & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp b/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp
index 939d7ce4..38f4881d 100644
--- a/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp
+++ b/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DVsmIfElseContFrame::shallow_move(DVsmIfElseContFrame & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DVsmIfElseContFrame::shallow_move(DVsmIfElseContFrame & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DVsmIfElseContFrame::forward_children(DVsmIfElseContFrame & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp b/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp
index 5d52ae74..3d57aaa1 100644
--- a/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp
+++ b/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DVsmSeqContFrame::shallow_move(DVsmSeqContFrame & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DVsmSeqContFrame::shallow_move(DVsmSeqContFrame & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DVsmSeqContFrame::forward_children(DVsmSeqContFrame & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/facet/IGCObject_DLocalEnv.cpp b/src/interpreter2/facet/IGCObject_DLocalEnv.cpp
index 61e645f6..ed9f18fd 100644
--- a/src/interpreter2/facet/IGCObject_DLocalEnv.cpp
+++ b/src/interpreter2/facet/IGCObject_DLocalEnv.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DLocalEnv::shallow_move(DLocalEnv & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DLocalEnv::shallow_move(DLocalEnv & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DLocalEnv::forward_children(DLocalEnv & self, obj<ACollector> gc) noexcept -> size_type
diff --git a/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp b/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp
index 354478ad..ddf77335 100644
--- a/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp
+++ b/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp
@@ -22,9 +22,9 @@ namespace xo {
         }
 
         auto
-        IGCObject_DVirtualSchematikaMachine::shallow_move(DVirtualSchematikaMachine & self, obj<AAllocator> mm) noexcept -> Opaque
+        IGCObject_DVirtualSchematikaMachine::shallow_move(DVirtualSchematikaMachine & self, obj<ACollector> gc) noexcept -> Opaque
         {
-            return self.shallow_move(mm);
+            return self.shallow_move(gc);
         }
         auto
         IGCObject_DVirtualSchematikaMachine::forward_children(DVirtualSchematikaMachine & self, obj<ACollector> gc) noexcept -> size_type