Merge remote-tracking branch 'origin/jo/lull-bump' into philip/tomb

pkg/arvo/sys/arvo.hoon

@@ -89,7 +89,7 @@
 ::  +wite: kernel action/error builder
 ::
 +$  ball  (wite [vane=term task=maze] maze)
-+$  card  (pair @tas *)
++$  card  (cask)
 +$  duct  (list wire)
 ++  hobo
   |$  [a]

pkg/arvo/sys/vane/khan.hoon

@@ -154,8 +154,7 @@
     =*  fyd         p.task
     =/  =beak       (get-beak bear.fyd now)
     =/  =wire       (make-wire beak p.args.fyd)
-    =/  =dais:clay
-      (get-dais beak p.q.args.fyd rof)
+    =/  =dais:clay  (get-dais beak p.q.args.fyd rof)
     =/  =vase
       (slap (vale.dais q.q.args.fyd) !,(*hoon [~ u=.]))
     =-  [[hen %pass wire -]~ khan-gate]
@@ -206,17 +205,13 @@
   ::
       %khan
     ?.  ?=(%arow +<.hin)    ~
-    ?~  tea  ~
-    ?.  ?=(%fyrd -.tea)  ~
+    ?.  ?=([%fyrd *] tea)   ~
     =*  row  p.hin
     ?.  ?=(%& -.row)
       [hen %give %avow row]~
-    =/  [=beak =mark]
-      (read-wire tea)
-    =/  =tube:clay
-      (get-tube beak p.p.row mark rof)
-    =/  =vase
-      (tube q.p.row)
+    =/  [=beak =mark]   (read-wire tea)
+    =/  =tube:clay      (get-tube beak p.p.row mark rof)
+    =/  =vase           (tube q.p.row)
     [hen %give %avow %& mark q.vase]~
   ==
 --