diff --git a/pkg/arvo/lib/pull-hook.hoon b/pkg/arvo/lib/pull-hook.hoon
index 7aa4aff3f..61e19b6d5 100644
--- a/pkg/arvo/lib/pull-hook.hoon
+++ b/pkg/arvo/lib/pull-hook.hoon
@@ -463,18 +463,18 @@
             ::  subscription
             tr-core
           (tr-suspend-pub-ver min-version.config)
-        =/  =vase
+        =/  =^cage
           (convert-to:ver cage)
         =/  =wire
           (make-wire /store)
-        =+  resources=(~(gas in *(set resource)) (resource-for-update:og vase))
+        =+  resources=(~(gas in *(set resource)) (resource-for-update:og q.cage))
         ?>  ?|  no-validate.config
             ?&  (check-src resources)
                 (~(has in resources) rid)
             ==  ==
         =/  =mark
           (append-version:ver version.config)
-        (tr-emit (~(poke-our pass wire) store-name.config mark vase))
+        (tr-emit (~(poke-our pass wire) store-name.config cage))
       --
     ::
     ++  tr-kick
diff --git a/pkg/arvo/lib/push-hook.hoon b/pkg/arvo/lib/push-hook.hoon
index 3158d87ac..e3f3611b5 100644
--- a/pkg/arvo/lib/push-hook.hoon
+++ b/pkg/arvo/lib/push-hook.hoon
@@ -291,10 +291,9 @@
       ?.  (supported:ver mark)
         :_  this
         (fact-init-kick:io version+!>(min-version.config))
-      =/  =vase
-        (convert-to:ver mark (initial-watch:og t.t.t.t.t.t.path resource))
       :_  this
-      [%give %fact ~ mark vase]~
+      =-  [%give %fact ~ -]~
+      (convert-to:ver mark (initial-watch:og t.t.t.t.t.t.path resource))
       ::
       ++  unversioned
         ?>  ?=([%ship @ @ *] t.path)
@@ -303,11 +302,10 @@
            `this
         =/  =resource
           (de-path:resource t.path)
-        =/  =vase
-          %+  convert-to:ver  update-mark.config
+        =/   =vase 
           (initial-watch:og t.t.t.t.path resource)
         :_  this
-        [%give %fact ~ update-mark.config vase]~
+        [%give %fact ~ (convert-to:ver update-mark.config vase)]~
       --
     ::
     ++  on-agent
@@ -461,10 +459,7 @@
       |=  [fact-ver=@ud paths=(set path)]
       =/  =mark
         (append-version:ver fact-ver)
-      =/  =^cage
-        :-  mark
-        (convert-from:ver mark q.cage)
-      (fact:io cage ~(tap in paths))
+      (fact:io (convert-from:ver mark q.cage) ~(tap in paths))
     ::  TODO: deprecate
     ++  unversioned
       ?.  =(min-version.config 0)  ~
@@ -474,18 +469,15 @@
         %-  ~(gas in *(set path))
         (turn (incoming-subscriptions prefix) tail)
       ?:  =(0 ~(wyt in unversioned))  ~
-      =/  =^cage
-        :-  update-mark.config
-        (convert-from:ver update-mark.config q.cage)
-      (fact:io cage ~(tap in unversioned))^~
+      (fact:io (convert-from:ver update-mark.config q.cage) ~(tap in unversioned))^~
     --
   ::
   ++  forward-update
     |=  =cage
     ^-  (list card:agent:gall)
     =-  lis
-    =/  vas
-      (convert-to:ver cage)
+    =/  vas=vase
+      q:(convert-to:ver cage)
     %+  roll  (resource-for-update q.cage)
     |=  [rid=resource [lis=(list card:agent:gall) tf-vas=(unit vase)]]
     ^-  [(list card:agent:gall) (unit vase)]
diff --git a/pkg/arvo/lib/versioning.hoon b/pkg/arvo/lib/versioning.hoon
index 418e21518..bddb10d57 100644
--- a/pkg/arvo/lib/versioning.hoon
+++ b/pkg/arvo/lib/versioning.hoon
@@ -29,11 +29,12 @@
   &((gte ver min) (lte ver version))
 ::
 ++  convert-to
-  |=  =cage
-  ^-  vase
-  ?:  =(p.cage current-version)
-    q.cage
-  ((tube-to p.cage) q.cage)
+  |=  [=mark =vase]
+  ^-  cage
+  :-  current-version
+  ?:  =(mark current-version)
+    vase
+  ((tube-to mark) vase)
 ::
 ++  tube-to
   |=  =mark
@@ -44,10 +45,11 @@
   .^(tube:clay %cc (scry:io %home /[current-version]/[mark]))
 ::
 ++  convert-from
-  |=  =cage
-  ^-  vase
-  ?:  =(p.cage current-version)
-    q.cage
-  ((tube-from p.cage) q.cage)
+  |=  [=mark =vase]
+  ^-  cage
+  :-  mark
+  ?:  =(mark current-version)
+    vase
+  ((tube-from mark) vase)
 --