diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index d5e8dff3b1..061fd8d364 100644
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -69,8 +69,8 @@ C: <button-pen> button-pen
 
 : button-pen ( button pen -- button pen )
     over find-button {
-        { [ dup { [ pressed?>> ] [ selected?>> ] } 1&& ]
-            [ drop pressed-selected>>
+        { [ dup { [ pressed?>> ] [ selected?>> ] } 1&& ] [
+            drop pressed-selected>>
         ] }
         { [ dup pressed?>> ] [ drop pressed>> ] }
         { [ dup selected?>> ] [ drop selected>> ] }
diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index 80e15d8a98..f83c5d710a 100755
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -112,7 +112,7 @@ M: editor ungraft*
     } cond ;
 
 : clicked-loc ( editor -- loc )
-    [ hand-rel ] [ point>loc ] bi ;
+    [ hand-rel ] keep point>loc ;
 
 : click-loc ( editor model -- )
     [ clicked-loc ] dip set-model ;
@@ -130,7 +130,7 @@ M: editor ungraft*
     [ loc>x ] [ [ first ] dip line>y ceiling ] 2bi 2array ;
 
 : caret-loc ( editor -- loc )
-    [ editor-caret ] [ loc>point ] bi ;
+    [ editor-caret ] keep loc>point ;
 
 : caret-dim ( editor -- dim )
     [ 0 ] dip line-height 2array ;
@@ -139,7 +139,7 @@ M: editor ungraft*
     dup graft-state>> second [
         [
             [ caret-loc ] [ caret-dim { 2 1 } v+ ] bi <rect>
-        ] [ scroll>rect ] bi
+        ] keep scroll>rect
     ] [ drop ] if ;
 
 : draw-caret? ( editor -- ? )
@@ -212,7 +212,7 @@ M: editor cap-height font>> font-metrics cap-height>> ;
     [ nip relayout ] 2tri ;
 
 : caret/mark-changed ( editor -- )
-    [ restart-blinking ] [ scroll>caret ] bi ;
+    [ restart-blinking ] keep scroll>caret ;
 
 M: editor model-changed
     {
diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor
index a6d9028a46..e4a0e672d2 100644
--- a/basis/ui/gadgets/gadgets.factor
+++ b/basis/ui/gadgets/gadgets.factor
@@ -115,7 +115,7 @@ M: gadget gadget-text-separator
     gadget-text-separator '[ _ % ] [ gadget-text* ] interleave ;
 
 M: gadget gadget-text*
-    [ children>> ] [ gadget-seq-text ] bi ;
+    [ children>> ] keep gadget-seq-text ;
 
 M: array gadget-text*
     [ gadget-text* ] each ;
@@ -183,7 +183,7 @@ GENERIC: pref-dim* ( gadget -- dim )
 
 : pref-dim ( gadget -- dim )
     dup pref-dim>> [ ] [
-        [ pref-dim* ] [ dup layout-state>> ] bi
+        [ pref-dim* ] [ ] [ layout-state>> ] tri
         [ drop ] [ dupd (>>pref-dim) ] if
     ] ?if ;
 
@@ -388,7 +388,7 @@ M: gadget request-focus-on parent>> request-focus-on ;
 M: f request-focus-on 2drop ;
 
 : request-focus ( gadget -- )
-    [ focusable-child ] [ request-focus-on ] bi ;
+    [ focusable-child ] keep request-focus-on ;
 
 : focus-path ( gadget -- seq )
     [ focus>> ] follow ;