aqua: address joe review

pkg/arvo/app/aqua.hoon

@@ -38,7 +38,7 @@
       ==
     ::  XX temporarily shadowed, fix and remove
     ::
-    +$  pill  boot-pill:pill-lib
+    +$  pill  pill:pill-lib
     ::
     +$  fleet  [ships=(map ship pier) azi=az-state]
     +$  pier
@@ -82,7 +82,7 @@
     =^  cards  state
       ?+  mark  ~|([%aqua-bad-mark mark] !!)
           %aqua-events     (poke-aqua-events:ac !<((list aqua-event) vase))
-          %boot-pill       (poke-pill:ac !<(pill vase))
+          %pill       (poke-pill:ac !<(pill vase))
           %noun            (poke-noun:ac !<(* vase))
           %azimuth-action  (poke-azimuth-action:ac !<(azimuth-action vase))
       ==
@@ -370,6 +370,7 @@
 ++  poke-pill
   |=  p=pill
   ^-  (quip card:agent:gall _state)
+  ?<  ?=(%ivory -.p)
   =.  this  apex-aqua  =<  abet-aqua
   =.  pil  p
   ~&  lent=(met 3 (jam boot-ova.pil))
@@ -514,7 +515,7 @@
       :~
         :~  [/ %wack 0]  ::  eny
             :: [/ %verb `|]  :: possible verb
-            :^  /  %wyrd  [%nonce /a-version] :: dummy runtime version + nonce
+            :^  /  %wyrd  [~.nonce /aqua] :: dummy runtime version + nonce
             ^-  (list (pair term @))
             :~  zuse+zuse
                 lull+lull

pkg/arvo/gen/brass.hoon

@@ -13,7 +13,7 @@
         ~
     ==
 :-  %boot-pill
-^-  boot-pill:pill
+^-  pill:pill
 ::
 ::  sys: root path to boot system, `/~me/[desk]/now/sys`
 ::

pkg/arvo/gen/solid.hoon

@@ -16,7 +16,7 @@
         dub=_|
     ==
 :-  %boot-pill
-^-  boot-pill:pill
+^-  pill:pill
 ::  sys: root path to boot system, `/~me/[desk]/now/sys`
 ::
 =/  sys=path

pkg/arvo/lib/pill.hoon

@@ -5,15 +5,12 @@
 ::
 +$  pill
   $%  [%ivory p=(list)]
-      boot-pill
-  ==
-::
-+$  boot-pill
-  $:  %pill
-      nam=term
-      boot-ova=(list)
-      kernel-ova=(list unix-event)
-      userspace-ova=(list unix-event)
+    $:  %pill
+        nam=term
+        boot-ova=(list)
+        kernel-ova=(list unix-event)
+        userspace-ova=(list unix-event)
+    ==
   ==
 ::
 +$  unix-event

pkg/arvo/mar/boot-pill.hoon

@@ -1,15 +0,0 @@
-::
-::::  /hoon/boot-pill/mar
-  ::
-/+  *pill
-|_  pil=boot-pill
-++  grow
-  |%
-  ++  noun  pil
-  --
-++  grab
-  |%
-  ++  noun  boot-pill
-  --
-++  grad  %noun
---