models.delay: some cleanup.

diff --git a/basis/models/delay/delay.factor b/basis/models/delay/delay.factor
index d194d76e6d09e5902d46ca9bad794eb04c4bb6c3..b7c9e7e8ed88fe985a8243c42d4288be799621f6 100644 (file)
--- a/basis/models/delay/delay.factor
+++ b/basis/models/delay/delay.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
-USING: accessors timers fry kernel models ;\r
+USING: accessors fry kernel models timers ;\r
 IN: models.delay\r
 \r
 TUPLE: delay < model model timeout timer ;\r
@@ -12,16 +12,15 @@ TUPLE: delay < model model timeout timer ;
     f delay new-model\r
         swap >>timeout\r
         over >>model\r
-        [ add-dependency ] keep ;\r
+    [ add-dependency ] keep ;\r
 \r
 : stop-delay ( delay -- )\r
     timer>> [ stop-timer ] when* ;\r
 \r
 : start-delay ( delay -- )\r
-    dup\r
-    [ '[ _ f >>timer update-delay-model ] ] [ timeout>> ] bi\r
-    later\r
-    >>timer drop ;\r
+    [ '[ _ f >>timer update-delay-model ] ]\r
+    [ timeout>> later ]\r
+    [ timer<< ] tri ;\r
 \r
 M: delay model-changed nip dup stop-delay start-delay ;\r
 \r