         swap >>prompt
         swap >>intro
         V{ } clone >>commands
-        V{ } clone >>abbrevs
-    [ <help-command> ] [ add-command ] [ ] tri ;
+        V{ } clone >>abbrevs {
+        [ <help-command> ]
+        [ add-command ]
+        [ <abbrevs-command> ]
+        [ add-command ]
+        [ ]
+    } cleave ;
 
 : <command-loop> ( intro prompt -- command-loop )
     command-loop new-command-loop ;

    "List available commands with 'help' or detailed help with 'help cmd'"
    { "?" } <command> ;

PRIVATE>

: new-command-loop ( intro prompt class -- command-loop )

! Copyright (C) 2021 John Benediktsson
! See http://factorcode.org/license.txt for BSD license

USING: accessors ascii assocs combinators formatting grouping io
kernel math sequences sorting splitting ;

IN: command-loop

