diff --git a/extra/ui/gadgets/labelled/labelled.factor b/extra/ui/gadgets/labelled/labelled.factor
index 686e940ae6..831ac1b1d8 100755
--- a/extra/ui/gadgets/labelled/labelled.factor
+++ b/extra/ui/gadgets/labelled/labelled.factor
@@ -12,9 +12,9 @@ TUPLE: labelled-gadget < track content ;
 
 : <labelled-gadget> ( gadget title -- newgadget )
   { 0 1 } labelled-gadget new-track
-    swap <label> reverse-video-theme f track-add*
+    swap <label> reverse-video-theme f track-add
     swap >>content
-    dup content>> 1 track-add* ;
+    dup content>> 1 track-add ;
 
 M: labelled-gadget focusable-child* labelled-gadget-content ;
 
diff --git a/extra/ui/gadgets/labels/labels.factor b/extra/ui/gadgets/labels/labels.factor
index e965d6b2b8..a3a5c1a0a6 100755
--- a/extra/ui/gadgets/labels/labels.factor
+++ b/extra/ui/gadgets/labels/labels.factor
@@ -65,10 +65,10 @@ M: f >label drop <gadget> ;
 
 : label-on-left ( gadget label -- button )
   { 1 0 } <track>
-    swap >label f track-add*
-    swap        1 track-add* ;
+    swap >label f track-add
+    swap        1 track-add ;
     
 : label-on-right ( label gadget -- button )
   { 1 0 } <track>
-    swap        f track-add*
-    swap >label 1 track-add* ;
+    swap        f track-add
+    swap >label 1 track-add ;
diff --git a/extra/ui/gadgets/slots/slots.factor b/extra/ui/gadgets/slots/slots.factor
index 2ce4a1fa8c..0102876136 100755
--- a/extra/ui/gadgets/slots/slots.factor
+++ b/extra/ui/gadgets/slots/slots.factor
@@ -71,9 +71,9 @@ M: value-ref finish-editing
 : <slot-editor> ( ref -- gadget )
   { 0 1 } slot-editor new-track
     swap >>ref
-    dup <toolbar> f track-add*
+    dup <toolbar> f track-add
     <source-editor> >>text
-    dup text>> <scroller> 1 track-add*
+    dup text>> <scroller> 1 track-add
     dup revert ;
     
 M: slot-editor pref-dim* call-next-method { 600 200 } vmin ;
@@ -97,8 +97,8 @@ TUPLE: editable-slot < track printer ref ;
 
 : display-slot ( gadget editable-slot -- )
   dup clear-track
-    swap          1 track-add*
-    <edit-button> f track-add*
+    swap          1 track-add
+    <edit-button> f track-add
   drop ;
 
 : update-slot ( editable-slot -- )
@@ -109,7 +109,7 @@ TUPLE: editable-slot < track printer ref ;
     [ clear-track ]
     [
         dup ref>> <slot-editor>
-        [ 1 track-add* drop ]
+        [ 1 track-add drop ]
         [ [ scroll>gadget ] [ request-focus ] bi* ] 2bi
     ] bi ;
 
diff --git a/extra/ui/gadgets/status-bar/status-bar.factor b/extra/ui/gadgets/status-bar/status-bar.factor
index 9c709c2f78..431804f4ca 100755
--- a/extra/ui/gadgets/status-bar/status-bar.factor
+++ b/extra/ui/gadgets/status-bar/status-bar.factor
@@ -12,7 +12,7 @@ IN: ui.gadgets.status-bar
 
 : open-status-window ( gadget title -- )
     f <model> [ <world> ] keep
-    <status-bar> f track-add*
+    <status-bar> f track-add
     open-world-window ;
 
 : show-summary ( object gadget -- )
diff --git a/extra/ui/gadgets/worlds/worlds.factor b/extra/ui/gadgets/worlds/worlds.factor
index 69bb8a13c0..88ba99201b 100755
--- a/extra/ui/gadgets/worlds/worlds.factor
+++ b/extra/ui/gadgets/worlds/worlds.factor
@@ -40,7 +40,7 @@ M: world request-focus-on ( child gadget -- )
         { 0 0 } >>window-loc
         swap >>status
         swap >>title
-        swap 1 track-add*
+        swap 1 track-add
     dup request-focus ;
 
 M: world layout*
diff --git a/extra/ui/tools/browser/browser.factor b/extra/ui/tools/browser/browser.factor
index ee427625f5..8f180714c8 100755
--- a/extra/ui/tools/browser/browser.factor
+++ b/extra/ui/tools/browser/browser.factor
@@ -22,9 +22,9 @@ TUPLE: browser-gadget < track pane history ;
 : <browser-gadget> ( -- gadget )
   { 0 1 } browser-gadget new-track
     dup init-history
-    dup <toolbar> f track-add*
+    dup <toolbar> f track-add
     dup <help-pane> >>pane
-    dup pane>> <scroller> 1 track-add* ;
+    dup pane>> <scroller> 1 track-add ;
 
 M: browser-gadget call-tool* show-help ;
 
diff --git a/extra/ui/tools/debugger/debugger.factor b/extra/ui/tools/debugger/debugger.factor
index 6ed98f4964..203406c6cb 100644
--- a/extra/ui/tools/debugger/debugger.factor
+++ b/extra/ui/tools/debugger/debugger.factor
@@ -25,9 +25,9 @@ TUPLE: debugger < track restarts ;
 
 : <debugger> ( error restarts restart-hook -- gadget )
     { 0 1 } debugger new-track
-        dup <toolbar> f track-add*
+        dup <toolbar> f track-add
         -rot <restart-list> >>restarts
-        dup restarts>> rot <debugger-display> <scroller> 1 track-add* ;
+        dup restarts>> rot <debugger-display> <scroller> 1 track-add ;
 
 M: debugger focusable-child* debugger-restarts ;
 
diff --git a/extra/ui/tools/inspector/inspector.factor b/extra/ui/tools/inspector/inspector.factor
index 8c92567fe5..bb0f02ec7e 100644
--- a/extra/ui/tools/inspector/inspector.factor
+++ b/extra/ui/tools/inspector/inspector.factor
@@ -17,9 +17,9 @@ TUPLE: inspector-gadget < track object pane ;
 
 : <inspector-gadget> ( -- gadget )
   { 0 1 } inspector-gadget new-track
-    dup <toolbar> f track-add*
+    dup <toolbar> f track-add
     <pane> >>pane
-    dup pane>> <scroller> 1 track-add* ;
+    dup pane>> <scroller> 1 track-add ;
     
 : inspect-object ( obj mirror keys inspector -- )
     2nip swap >>object refresh ;
diff --git a/extra/ui/tools/listener/listener.factor b/extra/ui/tools/listener/listener.factor
index baad793e3b..9890c21491 100755
--- a/extra/ui/tools/listener/listener.factor
+++ b/extra/ui/tools/listener/listener.factor
@@ -14,7 +14,7 @@ TUPLE: listener-gadget < track input output stack ;
 
 : listener-output, ( listener -- listener )
   <scrolling-pane> >>output
-  dup output>> <scroller> "Output" <labelled-gadget> 1 track-add* ;
+  dup output>> <scroller> "Output" <labelled-gadget> 1 track-add ;
 
 : listener-streams ( listener -- input output )
     [ input>> ] [ output>> <pane-stream> ] bi ;
@@ -27,7 +27,7 @@ TUPLE: listener-gadget < track input output stack ;
   dup input>>
     { 0 100 } <limited-scroller>
     "Input" <labelled-gadget>
-  f track-add* ;
+  f track-add ;
 
 : welcome. ( -- )
    "If this is your first time with Factor, please read the " print
@@ -125,10 +125,10 @@ TUPLE: stack-display < track ;
 : <stack-display> ( workspace -- gadget )
   listener>>
   { 0 1 } stack-display new-track
-    over <toolbar> f track-add*
+    over <toolbar> f track-add
     swap
       stack>> [ [ stack. ] curry try ] t "Data stack" <labelled-pane>
-    1 track-add* ;
+    1 track-add ;
 
 M: stack-display tool-scroller
     find-workspace workspace-listener tool-scroller ;
diff --git a/extra/ui/tools/profiler/profiler.factor b/extra/ui/tools/profiler/profiler.factor
index 9d25361e5e..f440bd8766 100755
--- a/extra/ui/tools/profiler/profiler.factor
+++ b/extra/ui/tools/profiler/profiler.factor
@@ -9,9 +9,9 @@ TUPLE: profiler-gadget < track pane ;
 
 : <profiler-gadget> ( -- gadget )
   { 0 1 } profiler-gadget new-track
-    dup <toolbar> f track-add*
+    dup <toolbar> f track-add
     <pane> >>pane
-    dup pane>> <scroller> 1 track-add* ;
+    dup pane>> <scroller> 1 track-add ;
     
 : with-profiler-pane ( gadget quot -- )
     >r profiler-gadget-pane r> with-pane ;
diff --git a/extra/ui/tools/search/search.factor b/extra/ui/tools/search/search.factor
index 0a8fe92762..2475ecc691 100755
--- a/extra/ui/tools/search/search.factor
+++ b/extra/ui/tools/search/search.factor
@@ -62,9 +62,9 @@ search-field H{
 : <live-search> ( string seq limited? presenter -- gadget )
   { 0 1 } live-search new-track
     <search-field> >>field
-    dup field>> f track-add*
+    dup field>> f track-add
     -roll <search-list> >>list
-    dup list>> <scroller> 1 track-add*
+    dup list>> <scroller> 1 track-add
 
   swap                         
     over field>> set-editor-string
diff --git a/extra/ui/tools/tools.factor b/extra/ui/tools/tools.factor
index c73e9bc5b1..4bfb209e3a 100755
--- a/extra/ui/tools/tools.factor
+++ b/extra/ui/tools/tools.factor
@@ -38,10 +38,10 @@ IN: ui.tools
     <listener-gadget>    >>listener
     dup <workspace-book> >>book
     
-    dup <workspace-tabs> f   track-add*
-    dup book>>           1/5 track-add*
-    dup listener>>       4/5 track-add*
-    dup <toolbar>        f   track-add* ;
+    dup <workspace-tabs> f   track-add
+    dup book>>           1/5 track-add
+    dup listener>>       4/5 track-add
+    dup <toolbar>        f   track-add ;
 
 : resize-workspace ( workspace -- )
     dup track-sizes over control-value zero? [
diff --git a/extra/ui/tools/traceback/traceback.factor b/extra/ui/tools/traceback/traceback.factor
index ffea857429..6438bc0ebb 100755
--- a/extra/ui/tools/traceback/traceback.factor
+++ b/extra/ui/tools/traceback/traceback.factor
@@ -30,13 +30,13 @@ M: traceback-gadget pref-dim* drop { 550 600 } ;
 
     dup model>>
       { 1 0 } <track>
-        over <datastack-display>   1/2 track-add*
-        swap <retainstack-display> 1/2 track-add*
-      1/3 track-add*
+        over <datastack-display>   1/2 track-add
+        swap <retainstack-display> 1/2 track-add
+      1/3 track-add
 
-    dup model>> <callstack-display> 2/3 track-add*
+    dup model>> <callstack-display> 2/3 track-add
 
-    dup <toolbar> f track-add* ;
+    dup <toolbar> f track-add ;
 
 : <namestack-display> ( model -- gadget )
     [ [ continuation-name namestack. ] when* ]
diff --git a/extra/ui/tools/walker/walker.factor b/extra/ui/tools/walker/walker.factor
index e5141fb844..c667e6918d 100755
--- a/extra/ui/tools/walker/walker.factor
+++ b/extra/ui/tools/walker/walker.factor
@@ -62,9 +62,9 @@ M: walker-gadget focusable-child*
         swap >>status
         dup continuation>> <traceback-gadget> >>traceback
 
-        dup <toolbar>                     f track-add*
-        dup status>> self <thread-status> f track-add*
-        dup traceback>>                   1 track-add* ;
+        dup <toolbar>                     f track-add
+        dup status>> self <thread-status> f track-add
+        dup traceback>>                   1 track-add ;
     
 : walker-help ( -- ) "ui-walker" help-window ;
 
diff --git a/extra/ui/tools/workspace/workspace.factor b/extra/ui/tools/workspace/workspace.factor
index 86cfdb02c7..0780103415 100755
--- a/extra/ui/tools/workspace/workspace.factor
+++ b/extra/ui/tools/workspace/workspace.factor
@@ -62,7 +62,7 @@ M: gadget tool-scroller drop f ;
 : show-popup ( gadget workspace -- )
   dup hide-popup
   over >>popup
-  over f track-add* drop
+  over f track-add drop
   request-focus ;
 
 : show-titled-popup ( workspace gadget title -- )