diff --git a/basis/alien/arrays/arrays.factor b/basis/alien/arrays/arrays.factor
index 71c3fd6ff2..94472e8261 100644
--- a/basis/alien/arrays/arrays.factor
+++ b/basis/alien/arrays/arrays.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien arrays alien.c-types alien.structs
-sequences math kernel namespaces libc cpu.architecture ;
+sequences math kernel namespaces make libc cpu.architecture ;
 IN: alien.arrays
 
 UNION: value-type array struct-type ;
diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
index f44941d88f..6a88441be9 100755
--- a/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: byte-arrays arrays assocs kernel kernel.private libc math
-namespaces parser sequences strings words assocs splitting
+namespaces make parser sequences strings words assocs splitting
 math.parser cpu.architecture alien alien.accessors quotations
 layouts system compiler.units io.files io.encodings.binary
 accessors combinators effects continuations ;
diff --git a/basis/alien/structs/fields/fields.factor b/basis/alien/structs/fields/fields.factor
index 5273c2c7ba..19e5b8c326 100644
--- a/basis/alien/structs/fields/fields.factor
+++ b/basis/alien/structs/fields/fields.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays kernel kernel.private math namespaces
-sequences strings words effects combinators alien.c-types ;
+make sequences strings words effects combinators alien.c-types ;
 IN: alien.structs.fields
 
 TUPLE: field-spec name offset type reader writer ;
diff --git a/basis/base64/base64.factor b/basis/base64/base64.factor
index 747cfa1128..7097de6c6e 100644
--- a/basis/base64/base64.factor
+++ b/basis/base64/base64.factor
@@ -1,12 +1,13 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math sequences io.binary splitting grouping ;
+USING: kernel math sequences io.binary splitting grouping
+accessors ;
 IN: base64
 
 <PRIVATE
 
-: count-end ( seq quot -- count )
-    >r [ length ] keep r> find-last drop dup [ - 1- ] [ 2drop 0 ] if ; inline
+: count-end ( seq quot -- n )
+    trim-right-slice [ seq>> length ] [ to>> ] bi - ; inline
 
 : ch>base64 ( ch -- ch )
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" nth ;
@@ -21,13 +22,16 @@ IN: base64
     } nth ;
 
 : encode3 ( seq -- seq )
-    be> 4 <reversed> [ -6 * shift HEX: 3f bitand ch>base64 ] with B{ } map-as ;
+    be> 4 <reversed> [
+        -6 * shift HEX: 3f bitand ch>base64
+    ] with B{ } map-as ;
 
 : decode4 ( str -- str )
     0 [ base64>ch swap 6 shift bitor ] reduce 3 >be ;
 
 : >base64-rem ( str -- str )
-    [ 3 0 pad-right encode3 ] [ length 1+ ] bi head 4 CHAR: = pad-right ;
+    [ 3 0 pad-right encode3 ] [ length 1+ ] bi
+    head-slice 4 CHAR: = pad-right ;
 
 PRIVATE>
 
@@ -42,5 +46,5 @@ PRIVATE>
 : base64> ( base64 -- str )
     #! input length must be a multiple of 4
     [ 4 <groups> [ decode4 ] map concat ]
-    [ [ CHAR: = = not ] count-end ]
+    [ [ CHAR: = = ] count-end ]
     bi head* ;
diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
index 9c99ed5cdb..9284728a7a 100755
--- a/basis/bootstrap/image/image.factor
+++ b/basis/bootstrap/image/image.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien arrays byte-arrays generic assocs hashtables assocs
-hashtables.private io kernel kernel.private math namespaces
+hashtables.private io kernel kernel.private math namespaces make
 parser prettyprint sequences sequences.private strings sbufs
 vectors words quotations assocs system layouts splitting
 grouping growable classes classes.builtin classes.tuple
@@ -280,7 +280,7 @@ M: f '
         [
             [
                 {
-                    [ hashcode , ]
+                    [ hashcode <fake-bignum> , ]
                     [ name>> , ]
                     [ vocabulary>> , ]
                     [ def>> , ]
diff --git a/basis/bootstrap/image/upload/upload.factor b/basis/bootstrap/image/upload/upload.factor
index de13b4aed4..f0edf85e65 100755
--- a/basis/bootstrap/image/upload/upload.factor
+++ b/basis/bootstrap/image/upload/upload.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: checksums checksums.openssl splitting assocs
-kernel io.files bootstrap.image sequences io namespaces
+kernel io.files bootstrap.image sequences io namespaces make
 io.launcher math io.encodings.ascii ;
 IN: bootstrap.image.upload
 
diff --git a/basis/channels/remote/remote.factor b/basis/channels/remote/remote.factor
index 9c1878e14d..1a7addac12 100755
--- a/basis/channels/remote/remote.factor
+++ b/basis/channels/remote/remote.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 ! Remote Channels
-USING: kernel init namespaces assocs arrays random
+USING: kernel init namespaces make assocs arrays random
 sequences channels match concurrency.messaging
 concurrency.distributed threads accessors ;
 IN: channels.remote
diff --git a/basis/checksums/common/common.factor b/basis/checksums/common/common.factor
index ea1c6f5b39..1f25efef24 100644
--- a/basis/checksums/common/common.factor
+++ b/basis/checksums/common/common.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math math.bitwise strings io.binary namespaces
-grouping ;
+make grouping ;
 IN: checksums.common
 
 SYMBOL: bytes-read
diff --git a/basis/checksums/sha1/sha1.factor b/basis/checksums/sha1/sha1.factor
index 6aa2cfa2eb..bbae421b16 100755
--- a/basis/checksums/sha1/sha1.factor
+++ b/basis/checksums/sha1/sha1.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators kernel io io.encodings.binary io.files
 io.streams.byte-array math.vectors strings sequences namespaces
-math parser sequences assocs grouping vectors io.binary hashtables
-symbols math.bitwise checksums checksums.common ;
+make math parser sequences assocs grouping vectors io.binary
+hashtables symbols math.bitwise checksums checksums.common ;
 IN: checksums.sha1
 
 ! Implemented according to RFC 3174.
diff --git a/basis/checksums/sha2/sha2.factor b/basis/checksums/sha2/sha2.factor
index ac93c05260..0a6d8c26ab 100755
--- a/basis/checksums/sha2/sha2.factor
+++ b/basis/checksums/sha2/sha2.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel splitting grouping math sequences namespaces
+USING: kernel splitting grouping math sequences namespaces make
 io.binary symbols math.bitwise checksums checksums.common
 sbufs strings ;
 IN: checksums.sha2
diff --git a/basis/cocoa/enumeration/enumeration.factor b/basis/cocoa/enumeration/enumeration.factor
index 765fb65ef2..7de1f24a3c 100644
--- a/basis/cocoa/enumeration/enumeration.factor
+++ b/basis/cocoa/enumeration/enumeration.factor
@@ -15,7 +15,7 @@ IN: cocoa.enumeration
     object state stackbuf count -> countByEnumeratingWithState:objects:count:
     dup zero? [ drop ] [
         state NSFastEnumerationState-itemsPtr [ stackbuf ] unless*
-        '[ , void*-nth quot call ] each
+        '[ _ void*-nth quot call ] each
         object quot state stackbuf count (NSFastEnumeration-each)
     ] if ; inline recursive
 
@@ -24,7 +24,7 @@ IN: cocoa.enumeration
 
 : NSFastEnumeration-map ( object quot -- vector )
     NS-EACH-BUFFER-SIZE <vector>
-    [ '[ @ , push ] NSFastEnumeration-each ] keep ; inline
+    [ '[ @ _ push ] NSFastEnumeration-each ] keep ; inline
 
 : NSFastEnumeration>vector ( object -- vector )
     [ ] NSFastEnumeration-map ;
diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor
index 1b804c3cf1..93de7658ef 100755
--- a/basis/cocoa/messages/messages.factor
+++ b/basis/cocoa/messages/messages.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types alien.strings
-arrays assocs combinators compiler kernel
-math namespaces parser prettyprint prettyprint.sections
-quotations sequences strings words cocoa.runtime io macros
-memoize debugger io.encodings.ascii effects compiler.generator
-libc libc.private ;
+USING: accessors alien alien.c-types alien.strings arrays assocs
+combinators compiler kernel math namespaces make parser
+prettyprint prettyprint.sections quotations sequences strings
+words cocoa.runtime io macros memoize debugger
+io.encodings.ascii effects compiler.generator libc libc.private ;
 IN: cocoa.messages
 
 : make-sender ( method function -- quot )
diff --git a/basis/cocoa/subclassing/subclassing.factor b/basis/cocoa/subclassing/subclassing.factor
index 1ee39c35d5..3f8e709df0 100755
--- a/basis/cocoa/subclassing/subclassing.factor
+++ b/basis/cocoa/subclassing/subclassing.factor
@@ -4,7 +4,7 @@ USING: alien alien.c-types alien.strings arrays assocs
 combinators compiler hashtables kernel libc math namespaces
 parser sequences words cocoa.messages cocoa.runtime
 compiler.units io.encodings.ascii generalizations
-continuations ;
+continuations make ;
 IN: cocoa.subclassing
 
 : init-method ( method -- sel imp types )
diff --git a/basis/cocoa/views/views.factor b/basis/cocoa/views/views.factor
index 8bfbe330b2..d03688b2be 100644
--- a/basis/cocoa/views/views.factor
+++ b/basis/cocoa/views/views.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2007 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.c-types arrays kernel math namespaces cocoa
+USING: alien.c-types arrays kernel math namespaces make cocoa
 cocoa.messages cocoa.classes cocoa.types sequences
 continuations ;
 IN: cocoa.views
diff --git a/basis/combinators/short-circuit/short-circuit.factor b/basis/combinators/short-circuit/short-circuit.factor
index a484e09de1..7b6c1d126d 100755
--- a/basis/combinators/short-circuit/short-circuit.factor
+++ b/basis/combinators/short-circuit/short-circuit.factor
@@ -11,7 +11,7 @@ IN: combinators.short-circuit
      [ '[ drop N ndup @ dup not ] [ drop N ndrop f ] 2array ]
    map
    [ t ] [ N nnip ] 2array suffix
-   '[ f , cond ] ;
+   '[ f _ cond ] ;
 
 MACRO: 0&& ( quots -- quot ) 0 n&&-rewrite ;
 MACRO: 1&& ( quots -- quot ) 1 n&&-rewrite ;
@@ -25,7 +25,7 @@ MACRO: 3&& ( quots -- quot ) 3 n&&-rewrite ;
      [ '[ drop N ndup @ dup ] [ N nnip ] 2array ]
    map
    [ drop N ndrop t ] [ f ] 2array suffix
-   '[ f , cond ] ;
+   '[ f _ cond ] ;
 
 MACRO: 0|| ( quots -- quot ) 0 n||-rewrite ;
 MACRO: 1|| ( quots -- quot ) 1 n||-rewrite ;
diff --git a/basis/compiler/compiler.factor b/basis/compiler/compiler.factor
index 2dd6e440d5..1558127293 100755
--- a/basis/compiler/compiler.factor
+++ b/basis/compiler/compiler.factor
@@ -54,7 +54,7 @@ SYMBOL: +failed+
         H{ } clone dependencies set
         H{ } clone generic-dependencies set
 
-        , {
+        _ {
             [ compile-begins ]
             [
                 [ build-tree-from-word ] [ compile-failed return ] recover
diff --git a/basis/compiler/generator/fixup/fixup.factor b/basis/compiler/generator/fixup/fixup.factor
index 5a3337fb32..ecc88a7a5e 100755
--- a/basis/compiler/generator/fixup/fixup.factor
+++ b/basis/compiler/generator/fixup/fixup.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays byte-arrays generic assocs hashtables io.binary
-kernel kernel.private math namespaces sequences words
+kernel kernel.private math namespaces make sequences words
 quotations strings alien.accessors alien.strings layouts system
 combinators math.bitwise words.private cpu.architecture
 math.order accessors growable ;
diff --git a/basis/compiler/generator/generator.factor b/basis/compiler/generator/generator.factor
index da120ce432..939d6e2276 100755
--- a/basis/compiler/generator/generator.factor
+++ b/basis/compiler/generator/generator.factor
@@ -1,15 +1,15 @@
- ! Copyright (C) 2004, 2008 Slava Pestov.
+! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs classes combinators
 cpu.architecture effects generic hashtables io kernel
-kernel.private layouts math math.parser namespaces prettyprint
-quotations sequences system threads words vectors sets deques
-continuations.private summary alien alien.c-types
+kernel.private layouts math math.parser namespaces make
+prettyprint quotations sequences system threads words vectors
+sets deques continuations.private summary alien alien.c-types
 alien.structs alien.strings alien.arrays libc compiler.errors
-stack-checker.inlining
-compiler.tree compiler.tree.builder compiler.tree.combinators
-compiler.tree.propagation.info compiler.generator.fixup
-compiler.generator.registers compiler.generator.iterator ;
+stack-checker.inlining compiler.tree compiler.tree.builder
+compiler.tree.combinators compiler.tree.propagation.info
+compiler.generator.fixup compiler.generator.registers
+compiler.generator.iterator ;
 IN: compiler.generator
 
 SYMBOL: compile-queue
diff --git a/basis/compiler/generator/registers/registers.factor b/basis/compiler/generator/registers/registers.factor
index e909db3f83..6fdb8d9886 100755
--- a/basis/compiler/generator/registers/registers.factor
+++ b/basis/compiler/generator/registers/registers.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs classes classes.private classes.algebra
-combinators hashtables kernel layouts math namespaces quotations
-sequences system vectors words effects alien byte-arrays
-accessors sets math.order cpu.architecture
+combinators hashtables kernel layouts math namespaces make
+quotations sequences system vectors words effects alien
+byte-arrays accessors sets math.order cpu.architecture
 compiler.generator.fixup ;
 IN: compiler.generator.registers
 
@@ -50,13 +50,21 @@ C: <vreg> vreg ( n reg-class -- vreg )
 
 M: vreg v>operand [ n>> ] [ reg-class>> ] bi vregs nth ;
 M: vreg live-vregs* , ;
-M: vreg move-spec reg-class>> move-spec ;
+
+M: vreg move-spec
+    reg-class>> {
+        { [ dup int-regs? ] [ f ] }
+        { [ dup float-regs? ] [ float ] }
+    } cond nip ;
+
+M: vreg operand-class*
+    reg-class>> {
+        { [ dup int-regs? ] [ f ] }
+        { [ dup float-regs? ] [ float ] }
+    } cond nip ;
 
 INSTANCE: vreg value
 
-M: float-regs move-spec drop float ;
-M: float-regs operand-class* drop float ;
-
 ! Temporary register for stack shuffling
 SINGLETON: temp-reg
 
diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor
index e44ae681ff..dc73888796 100755
--- a/basis/compiler/tests/alien.factor
+++ b/basis/compiler/tests/alien.factor
@@ -3,7 +3,7 @@ USING: alien alien.c-types alien.syntax compiler kernel
 namespaces namespaces tools.test sequences stack-checker
 stack-checker.errors words arrays parser quotations
 continuations effects namespaces.private io io.streams.string
-memory system threads tools.test math accessors ;
+memory system threads tools.test math accessors combinators ;
 
 FUNCTION: void ffi_test_0 ;
 [ ] [ ffi_test_0 ] unit-test
@@ -401,3 +401,41 @@ C-STRUCT: test_struct_13
 FUNCTION: int ffi_test_39 ( long a, long b, test_struct_13 s ) ;
 
 [ 21 ] [ 12347 12347 make-test-struct-13 ffi_test_39 ] unit-test
+
+! Joe Groff found this problem
+C-STRUCT: double-rect
+{ "double" "a" }
+{ "double" "b" }
+{ "double" "c" }
+{ "double" "d" } ;
+
+: <double-rect> ( a b c d -- foo )
+    "double-rect" <c-object>
+    {
+        [ set-double-rect-d ]
+        [ set-double-rect-c ]
+        [ set-double-rect-b ]
+        [ set-double-rect-a ]
+        [ ]
+    } cleave ;
+
+: >double-rect< ( foo -- a b c d )
+    {
+        [ double-rect-a ]
+        [ double-rect-b ]
+        [ double-rect-c ]
+        [ double-rect-d ]
+    } cleave ;
+
+: double-rect-callback ( -- alien )
+    "void" { "void*" "void*" "double-rect" } "cdecl"
+    [ "example" set-global 2drop ] alien-callback ;
+
+: double-rect-test ( arg -- arg' )
+    f f rot
+    double-rect-callback
+    "void" { "void*" "void*" "double-rect" } "cdecl" alien-indirect
+    "example" get-global ;
+
+[ 1.0 2.0 3.0 4.0 ]
+[ 1.0 2.0 3.0 4.0 <double-rect> double-rect-test >double-rect< ] unit-test
diff --git a/basis/compiler/tests/curry.factor b/basis/compiler/tests/curry.factor
index 61d20fd8ab..ecc2d87b73 100755
--- a/basis/compiler/tests/curry.factor
+++ b/basis/compiler/tests/curry.factor
@@ -1,5 +1,5 @@
 USING: tools.test quotations math kernel sequences
-assocs namespaces compiler.units ;
+assocs namespaces make compiler.units ;
 IN: compiler.tests
 
 [ 3 ] [ 5 [ [ 2 - ] curry call ] compile-call ] unit-test
diff --git a/basis/compiler/tests/templates-early.factor b/basis/compiler/tests/templates-early.factor
index 6b2eed0789..d3bc4a8a08 100755
--- a/basis/compiler/tests/templates-early.factor
+++ b/basis/compiler/tests/templates-early.factor
@@ -3,7 +3,7 @@ IN: compiler.tests
 USING: compiler compiler.generator compiler.generator.registers
 compiler.generator.registers.private tools.test namespaces
 sequences words kernel math effects definitions compiler.units
-accessors cpu.architecture ;
+accessors cpu.architecture make ;
 
 : <int-vreg> ( n -- vreg ) int-regs <vreg> ;
 
diff --git a/basis/compiler/tree/cleanup/cleanup-tests.factor b/basis/compiler/tree/cleanup/cleanup-tests.factor
index bb30cda685..2e8eb15959 100644
--- a/basis/compiler/tree/cleanup/cleanup-tests.factor
+++ b/basis/compiler/tree/cleanup/cleanup-tests.factor
@@ -10,12 +10,13 @@ compiler.tree
 compiler.tree.combinators
 compiler.tree.cleanup
 compiler.tree.builder
+compiler.tree.recursive
 compiler.tree.normalization
 compiler.tree.propagation
 compiler.tree.checker ;
 
 : cleaned-up-tree ( quot -- nodes )
-    build-tree normalize propagate cleanup dup check-nodes ;
+    build-tree analyze-recursive normalize propagate cleanup dup check-nodes ;
 
 [ t ] [ [ [ 1 ] [ 2 ] if ] cleaned-up-tree [ #if? ] contains-node? ] unit-test
 
@@ -36,7 +37,7 @@ compiler.tree.checker ;
 : inlined? ( quot seq/word -- ? )
     [ cleaned-up-tree ] dip
     dup word? [ 1array ] when
-    '[ dup #call? [ word>> , member? ] [ drop f ] if ]
+    '[ dup #call? [ word>> _ member? ] [ drop f ] if ]
     contains-node? not ;
 
 [ f ] [
@@ -457,3 +458,43 @@ cell-bits 32 = [
     [ [ >r "A" throw r> ] [ "B" throw ] if ]
     cleaned-up-tree drop
 ] unit-test
+
+! Regression from benchmark.nsieve
+: chicken-fingers ( i seq -- )
+    2dup < [
+        2drop
+    ] [
+        chicken-fingers
+    ] if ; inline recursive
+
+: buffalo-wings ( i seq -- )
+    2dup < [
+        2dup chicken-fingers
+        >r 1+ r> buffalo-wings
+    ] [
+        2drop
+    ] if ; inline recursive
+
+[ t ] [
+    [ 2 swap >fixnum buffalo-wings ]
+    { <-integer-fixnum +-integer-fixnum } inlined?
+] unit-test
+
+! A reduction
+: buffalo-sauce f ;
+
+: steak ( -- )
+    buffalo-sauce [ steak ] when ; inline recursive
+
+: ribs ( i seq -- )
+    2dup < [
+        steak
+        >r 1+ r> ribs
+    ] [
+        2drop
+    ] if ; inline recursive
+
+[ t ] [
+    [ 2 swap >fixnum ribs ]
+    { <-integer-fixnum +-integer-fixnum } inlined?
+] unit-test
diff --git a/basis/compiler/tree/cleanup/cleanup.factor b/basis/compiler/tree/cleanup/cleanup.factor
index 44a6a11802..58dc07d868 100644
--- a/basis/compiler/tree/cleanup/cleanup.factor
+++ b/basis/compiler/tree/cleanup/cleanup.factor
@@ -101,7 +101,7 @@ M: #declare cleanup* drop f ;
 
 : delete-unreachable-branches ( #branch -- )
     dup live-branches>> '[
-        ,
+        _
         [ [ [ drop ] [ delete-nodes ] if ] 2each ]
         [ select-children ]
         2bi
@@ -148,9 +148,9 @@ M: #branch cleanup*
 M: #phi cleanup*
     #! Remove #phi function inputs which no longer exist.
     live-branches get
-    [ '[ , sift-children ] change-phi-in-d ]
-    [ '[ , sift-children ] change-phi-info-d ]
-    [ '[ , sift-children ] change-terminated ] tri
+    [ '[ _ sift-children ] change-phi-in-d ]
+    [ '[ _ sift-children ] change-phi-info-d ]
+    [ '[ _ sift-children ] change-terminated ] tri
     eliminate-phi
     live-branches off ;
 
diff --git a/basis/compiler/tree/combinators/combinators.factor b/basis/compiler/tree/combinators/combinators.factor
index 0f4dc3f2a3..f284a06a88 100644
--- a/basis/compiler/tree/combinators/combinators.factor
+++ b/basis/compiler/tree/combinators/combinators.factor
@@ -6,12 +6,12 @@ IN: compiler.tree.combinators
 
 : each-node ( nodes quot: ( node -- ) -- )
     dup dup '[
-        , [
+        _ [
             dup #branch? [
-                children>> [ , each-node ] each
+                children>> [ _ each-node ] each
             ] [
                 dup #recursive? [
-                    child>> , each-node
+                    child>> _ each-node
                 ] [ drop ] if
             ] if
         ] bi
@@ -21,22 +21,22 @@ IN: compiler.tree.combinators
     dup dup '[
         @
         dup #branch? [
-            [ [ , map-nodes ] map ] change-children
+            [ [ _ map-nodes ] map ] change-children
         ] [
             dup #recursive? [
-                [ , map-nodes ] change-child
+                [ _ map-nodes ] change-child
             ] when
         ] if
     ] map flatten ; inline recursive
 
 : contains-node? ( nodes quot: ( node -- ? ) -- ? )
     dup dup '[
-        , keep swap [ drop t ] [
+        _ keep swap [ drop t ] [
             dup #branch? [
-                children>> [ , contains-node? ] contains?
+                children>> [ _ contains-node? ] contains?
             ] [
                 dup #recursive? [
-                    child>> , contains-node?
+                    child>> _ contains-node?
                 ] [ drop f ] if
             ] if
         ] if
diff --git a/basis/compiler/tree/dead-code/branches/branches.factor b/basis/compiler/tree/dead-code/branches/branches.factor
index 0014a1d4d7..a19e49494e 100644
--- a/basis/compiler/tree/dead-code/branches/branches.factor
+++ b/basis/compiler/tree/dead-code/branches/branches.factor
@@ -33,7 +33,7 @@ M: #branch remove-dead-code*
 
 : live-value-indices ( values -- indices )
     [ length ] keep live-values get
-    '[ , nth , key? ] filter ; inline
+    '[ _ nth _ key? ] filter ; inline
 
 : drop-indexed-values ( values indices -- node )
     [ drop filter-live ] [ nths ] 2bi
@@ -44,13 +44,13 @@ M: #branch remove-dead-code*
 : insert-drops ( nodes values indices -- nodes' )
     '[
         over ends-with-terminate?
-        [ drop ] [ , drop-indexed-values suffix ] if
+        [ drop ] [ _ drop-indexed-values suffix ] if
     ] 2map ;
 
 : hoist-drops ( #phi -- )
     if-node get swap
     [ phi-in-d>> ] [ out-d>> live-value-indices ] bi
-    '[ , , insert-drops ] change-children drop ;
+    '[ _ _ insert-drops ] change-children drop ;
 
 : remove-phi-outputs ( #phi -- )
     [ filter-live ] change-out-d drop ;
diff --git a/basis/compiler/tree/dead-code/dead-code-tests.factor b/basis/compiler/tree/dead-code/dead-code-tests.factor
index e8d2b29027..7b15fdf856 100644
--- a/basis/compiler/tree/dead-code/dead-code-tests.factor
+++ b/basis/compiler/tree/dead-code/dead-code-tests.factor
@@ -3,16 +3,17 @@ compiler.tree.dead-code compiler.tree.def-use compiler.tree
 compiler.tree.combinators compiler.tree.propagation
 compiler.tree.cleanup compiler.tree.escape-analysis
 compiler.tree.tuple-unboxing compiler.tree.debugger
-compiler.tree.normalization compiler.tree.checker tools.test
-kernel math stack-checker.state accessors combinators io
-prettyprint words sequences.deep sequences.private arrays
-classes kernel.private ;
+compiler.tree.recursive compiler.tree.normalization
+compiler.tree.checker tools.test kernel math stack-checker.state
+accessors combinators io prettyprint words sequences.deep
+sequences.private arrays classes kernel.private ;
 IN: compiler.tree.dead-code.tests
 
 \ remove-dead-code must-infer
 
 : count-live-values ( quot -- n )
     build-tree
+    analyze-recursive
     normalize
     propagate
     cleanup
@@ -64,6 +65,7 @@ IN: compiler.tree.dead-code.tests
 
 : optimize-quot ( quot -- quot' )
     build-tree
+    analyze-recursive
     normalize
     propagate
     cleanup
diff --git a/basis/compiler/tree/dead-code/simple/simple.factor b/basis/compiler/tree/dead-code/simple/simple.factor
index 9ebf064f79..addb13ced3 100755
--- a/basis/compiler/tree/dead-code/simple/simple.factor
+++ b/basis/compiler/tree/dead-code/simple/simple.factor
@@ -53,7 +53,7 @@ M: #alien-invoke compute-live-values* nip look-at-inputs ;
 M: #alien-indirect compute-live-values* nip look-at-inputs ;
 
 : filter-mapping ( assoc -- assoc' )
-    live-values get '[ drop , key? ] assoc-filter ;
+    live-values get '[ drop _ key? ] assoc-filter ;
 
 : filter-corresponding ( new old -- old' )
     #! Remove elements from 'old' if the element with the same
diff --git a/basis/compiler/tree/debugger/debugger.factor b/basis/compiler/tree/debugger/debugger.factor
index db742197a5..691c564661 100644
--- a/basis/compiler/tree/debugger/debugger.factor
+++ b/basis/compiler/tree/debugger/debugger.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel assocs fry match accessors namespaces effects
+USING: kernel assocs fry match accessors namespaces make effects
 sequences sequences.private quotations generic macros arrays
 prettyprint prettyprint.backend prettyprint.sections math words
 combinators io sorting hints
@@ -16,7 +16,7 @@ IN: compiler.tree.debugger
 GENERIC: node>quot ( node -- )
 
 MACRO: match-choose ( alist -- )
-    [ '[ , ] ] assoc-map '[ , match-cond ] ;
+    [ [ ] curry ] assoc-map [ match-cond ] curry ;
 
 MATCH-VARS: ?a ?b ?c ;
 
diff --git a/basis/compiler/tree/def-use/def-use-tests.factor b/basis/compiler/tree/def-use/def-use-tests.factor
index 993627eb15..d970e04afd 100755
--- a/basis/compiler/tree/def-use/def-use-tests.factor
+++ b/basis/compiler/tree/def-use/def-use-tests.factor
@@ -1,9 +1,10 @@
 USING: accessors namespaces assocs kernel sequences math
 tools.test words sets combinators.short-circuit
 stack-checker.state compiler.tree compiler.tree.builder
-compiler.tree.normalization compiler.tree.propagation
-compiler.tree.cleanup compiler.tree.def-use arrays kernel.private
-sorting math.order binary-search compiler.tree.checker ;
+compiler.tree.recursive compiler.tree.normalization
+compiler.tree.propagation compiler.tree.cleanup
+compiler.tree.def-use arrays kernel.private sorting math.order
+binary-search compiler.tree.checker ;
 IN: compiler.tree.def-use.tests
 
 \ compute-def-use must-infer
@@ -18,6 +19,7 @@ IN: compiler.tree.def-use.tests
 
 : test-def-use ( quot -- )
     build-tree
+    analyze-recursive
     normalize
     propagate
     cleanup
@@ -27,7 +29,14 @@ IN: compiler.tree.def-use.tests
 : too-deep ( a b -- c )
     dup [ drop ] [ 2dup too-deep too-deep drop ] if ; inline recursive
 
-[ ] [ [ too-deep ] build-tree normalize compute-def-use check-nodes ] unit-test
+[ ] [
+    [ too-deep ]
+    build-tree
+    analyze-recursive
+    normalize
+    compute-def-use
+    check-nodes
+] unit-test
 
 ! compute-def-use checks for SSA violations, so we use that to
 ! ensure we generate some common patterns correctly.
diff --git a/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor b/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor
index f51046c6cb..7ece8a5a80 100644
--- a/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor
+++ b/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor
@@ -1,13 +1,14 @@
 IN: compiler.tree.escape-analysis.tests
 USING: compiler.tree.escape-analysis
 compiler.tree.escape-analysis.allocations compiler.tree.builder
-compiler.tree.normalization math.functions
-compiler.tree.propagation compiler.tree.cleanup
-compiler.tree.combinators compiler.tree sequences math math.private
-kernel tools.test accessors slots.private quotations.private
-prettyprint classes.tuple.private classes classes.tuple
-compiler.intrinsics namespaces compiler.tree.propagation.info
-stack-checker.errors kernel.private ;
+compiler.tree.recursive compiler.tree.normalization
+math.functions compiler.tree.propagation compiler.tree.cleanup
+compiler.tree.combinators compiler.tree sequences math
+math.private kernel tools.test accessors slots.private
+quotations.private prettyprint classes.tuple.private classes
+classes.tuple compiler.intrinsics namespaces
+compiler.tree.propagation.info stack-checker.errors
+kernel.private ;
 
 \ escape-analysis must-infer
 
@@ -28,6 +29,7 @@ M: node count-unboxed-allocations* drop ;
 
 : count-unboxed-allocations ( quot -- sizes )
     build-tree
+    analyze-recursive
     normalize
     propagate
     cleanup
diff --git a/basis/compiler/tree/escape-analysis/recursive/recursive.factor b/basis/compiler/tree/escape-analysis/recursive/recursive.factor
index 059ac1de02..5aece23d17 100644
--- a/basis/compiler/tree/escape-analysis/recursive/recursive.factor
+++ b/basis/compiler/tree/escape-analysis/recursive/recursive.factor
@@ -28,7 +28,7 @@ IN: compiler.tree.escape-analysis.recursive
 
 : recursive-stacks ( #enter-recursive -- stacks )
     recursive-phi-in
-    escaping-values get '[ [ , disjoint-set-member? ] all? ] filter
+    escaping-values get '[ [ _ disjoint-set-member? ] all? ] filter
     flip ;
 
 : analyze-recursive-phi ( #enter-recursive -- )
@@ -67,5 +67,5 @@ M: #return-recursive escape-analysis* ( #return-recursive -- )
     [ call-next-method ]
     [
         [ in-d>> ] [ label>> calls>> ] bi
-        [ out-d>> escaping-values get '[ , equate ] 2each ] with each
+        [ out-d>> escaping-values get '[ _ equate ] 2each ] with each
     ] bi ;
diff --git a/basis/compiler/tree/finalization/finalization.factor b/basis/compiler/tree/finalization/finalization.factor
index 5aaeed360a..ba7e4ff652 100644
--- a/basis/compiler/tree/finalization/finalization.factor
+++ b/basis/compiler/tree/finalization/finalization.factor
@@ -1,12 +1,13 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel arrays accessors sequences sequences.private words
-fry namespaces math math.order memoize classes.builtin
+fry namespaces make math math.order memoize classes.builtin
 classes.tuple.private slots.private combinators layouts
 byte-arrays alien.accessors
 compiler.intrinsics
 compiler.tree
 compiler.tree.builder
+compiler.tree.recursive
 compiler.tree.normalization
 compiler.tree.propagation
 compiler.tree.propagation.info
@@ -39,6 +40,7 @@ M: #shuffle finalize*
 : splice-quot ( quot -- nodes )
     [
         build-tree
+        analyze-recursive 
         normalize
         propagate
         cleanup
@@ -68,7 +70,7 @@ MEMO: builtin-predicate-expansion ( word -- nodes )
 MEMO: (tuple-boa-expansion) ( n -- quot )
     [
         [ 2 + ] map <reversed>
-        [ '[ [ , set-slot ] keep ] % ] each
+        [ '[ [ _ set-slot ] keep ] % ] each
     ] [ ] make ;
 
 : tuple-boa-expansion ( layout -- quot )
diff --git a/basis/compiler/tree/identities/identities.factor b/basis/compiler/tree/identities/identities.factor
new file mode 100644
index 0000000000..d6ed59cbaa
--- /dev/null
+++ b/basis/compiler/tree/identities/identities.factor
@@ -0,0 +1,98 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors kernel sequences fry words math
+math.partial-dispatch combinators arrays hashtables
+compiler.tree
+compiler.tree.combinators
+compiler.tree.propagation.info ;
+IN: compiler.tree.identities
+
+: define-identities ( word identities -- )
+    [ integer-derived-ops ] dip
+    '[ _ "identities" set-word-prop ] each ;
+
+SYMBOL: X
+
+\ + {
+    { { X 0 } drop }
+    { { 0 X } nip }
+} define-identities
+
+\ - {
+    { { X 0 } drop }
+} define-identities
+
+\ * {
+    { { X 1 } drop }
+    { { 1 X } nip }
+    { { X 0 } nip }
+    { { 0 X } drop }
+} define-identities
+
+\ / {
+    { { X 1 } drop }
+} define-identities
+
+\ mod {
+    { { X 1 } 0 }
+} define-identities
+
+\ rem {
+    { { X 1 } 0 }
+} define-identities
+
+\ bitand {
+    { { X -1 } drop }
+    { { -1 X } nip }
+    { { X 0 } nip }
+    { { 0 X } drop }
+} define-identities
+
+\ bitor {
+    { { X 0 } drop }
+    { { 0 X } nip }
+    { { X -1 } nip }
+    { { -1 X } drop }
+} define-identities
+
+\ bitxor {
+    { { X 0 } drop }
+    { { 0 X } nip }
+} define-identities
+
+\ shift {
+    { { 0 X } drop }
+    { { X 0 } drop }
+} define-identities
+
+: matches? ( pattern infos -- ? )
+    [ over X eq? [ 2drop t ] [ literal>> = ] if ] 2all? ;
+
+: find-identity ( patterns infos -- result )
+    '[ first _ matches? ] find swap [ second ] when ;
+
+GENERIC: apply-identities* ( node -- node )
+
+: simplify-to-constant ( #call constant -- nodes )
+    [ [ in-d>> #drop ] [ out-d>> first ] bi ] dip swap #push
+    2array ;
+
+: select-input ( node n -- #shuffle )
+    [ [ in-d>> ] [ out-d>> ] bi ] dip
+    pick nth over first associate #shuffle ;
+
+M: #call apply-identities*
+    dup word>> "identities" word-prop [
+        over node-input-infos find-identity [
+            {
+                { \ drop [ 0 select-input ] }
+                { \ nip [ 1 select-input ] }
+                [ simplify-to-constant ]
+            } case
+        ] when*
+    ] when* ;
+
+M: node apply-identities* ;
+
+: apply-identities ( nodes -- nodes' )
+    [ apply-identities* ] map-nodes ;
diff --git a/basis/compiler/tree/normalization/introductions/introductions.factor b/basis/compiler/tree/normalization/introductions/introductions.factor
new file mode 100644
index 0000000000..9e96dc0472
--- /dev/null
+++ b/basis/compiler/tree/normalization/introductions/introductions.factor
@@ -0,0 +1,36 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: namespaces sequences accessors math kernel
+compiler.tree ;
+IN: compiler.tree.normalization.introductions
+
+SYMBOL: introductions
+
+GENERIC: count-introductions* ( node -- )
+
+: count-introductions ( nodes -- n )
+    #! Note: we use each, not each-node, since the #branch
+    #! method recurses into children directly and we don't
+    #! recurse into #recursive at all.
+    [
+        0 introductions set
+        [ count-introductions* ] each
+        introductions get
+    ] with-scope ;
+
+: introductions+ ( n -- ) introductions [ + ] change ;
+
+M: #introduce count-introductions*
+    out-d>> length introductions+ ;
+
+M: #branch count-introductions*
+    children>>
+    [ count-introductions ] map supremum
+    introductions+ ;
+
+M: #recursive count-introductions*
+    [ label>> ] [ child>> count-introductions ] bi
+    >>introductions
+    drop ;
+
+M: node count-introductions* drop ;
diff --git a/basis/compiler/tree/normalization/normalization-tests.factor b/basis/compiler/tree/normalization/normalization-tests.factor
index 1b4f728adc..c4a97fcc92 100644
--- a/basis/compiler/tree/normalization/normalization-tests.factor
+++ b/basis/compiler/tree/normalization/normalization-tests.factor
@@ -1,5 +1,8 @@
 IN: compiler.tree.normalization.tests
-USING: compiler.tree.builder compiler.tree.normalization
+USING: compiler.tree.builder compiler.tree.recursive
+compiler.tree.normalization
+compiler.tree.normalization.introductions
+compiler.tree.normalization.renaming
 compiler.tree compiler.tree.checker
 sequences accessors tools.test kernel math ;
 
@@ -22,27 +25,30 @@ sequences accessors tools.test kernel math ;
 [ 0 2 ] [
     [ foo ] build-tree
     [ recursive-inputs ]
-    [ normalize recursive-inputs ] bi
+    [ analyze-recursive normalize recursive-inputs ] bi
 ] unit-test
 
-[ ] [ [ [ 1 ] [ 2 ] if + * ] build-tree normalize check-nodes ] unit-test
+: test-normalization ( quot -- )
+    build-tree analyze-recursive normalize check-nodes ;
+
+[ ] [ [ [ 1 ] [ 2 ] if + * ] test-normalization ] unit-test
 
 DEFER: bbb
 : aaa ( x -- ) dup [ dup >r bbb r> aaa ] [ drop ] if ; inline recursive
 : bbb ( x -- ) >r drop 0 r> aaa ; inline recursive
 
-[ ] [ [ bbb ] build-tree normalize check-nodes ] unit-test
+[ ] [ [ bbb ] test-normalization ] unit-test
 
 : ccc ( -- ) ccc drop 1 ; inline recursive
 
-[ ] [ [ ccc ] build-tree normalize check-nodes ] unit-test
+[ ] [ [ ccc ] test-normalization ] unit-test
 
 DEFER: eee
 : ddd ( -- ) eee ; inline recursive
 : eee ( -- ) swap ddd ; inline recursive
 
-[ ] [ [ eee ] build-tree normalize check-nodes ] unit-test
+[ ] [ [ eee ] test-normalization ] unit-test
 
 : call-recursive-5 ( -- ) call-recursive-5 ; inline recursive
 
-[ ] [ [ call-recursive-5 swap ] build-tree normalize check-nodes ] unit-test
+[ ] [ [ call-recursive-5 swap ] test-normalization ] unit-test
diff --git a/basis/compiler/tree/normalization/normalization.factor b/basis/compiler/tree/normalization/normalization.factor
index 587dd6938b..bebe2e91b6 100644
--- a/basis/compiler/tree/normalization/normalization.factor
+++ b/basis/compiler/tree/normalization/normalization.factor
@@ -6,7 +6,9 @@ stack-checker.backend
 stack-checker.branches
 stack-checker.inlining
 compiler.tree
-compiler.tree.combinators ;
+compiler.tree.combinators
+compiler.tree.normalization.introductions
+compiler.tree.normalization.renaming ;
 IN: compiler.tree.normalization
 
 ! A transform pass done before optimization can begin to
@@ -16,9 +18,6 @@ IN: compiler.tree.normalization
 ! replaced with a single one, at the beginning of a program.
 ! This simplifies subsequent analysis.
 !
-! - We collect #return-recursive and #call-recursive nodes and
-! store them in the #recursive's label slot.
-!
 ! - We normalize #call-recursive as follows. The stack checker
 ! says that the inputs of a #call-recursive are the entire stack
 ! at the time of the call. This is a conservative estimate; we
@@ -28,93 +27,6 @@ IN: compiler.tree.normalization
 ! #call-recursive into a #copy of the unchanged values and a
 ! #call-recursive with trimmed inputs and outputs.
 
-! Collect introductions
-SYMBOL: introductions
-
-GENERIC: count-introductions* ( node -- )
-
-: count-introductions ( nodes -- n )
-    #! Note: we use each, not each-node, since the #branch
-    #! method recurses into children directly and we don't
-    #! recurse into #recursive at all.
-    [
-        0 introductions set
-        [ count-introductions* ] each
-        introductions get
-    ] with-scope ;
-
-: introductions+ ( n -- ) introductions [ + ] change ;
-
-M: #introduce count-introductions*
-    out-d>> length introductions+ ;
-
-M: #branch count-introductions*
-    children>>
-    [ count-introductions ] map supremum
-    introductions+ ;
-
-M: #recursive count-introductions*
-    [ label>> ] [ child>> count-introductions ] bi
-    >>introductions
-    drop ;
-
-M: node count-introductions* drop ;
-
-! Collect label info
-GENERIC: collect-label-info ( node -- )
-
-M: #return-recursive collect-label-info
-    dup label>> (>>return) ;
-
-M: #call-recursive collect-label-info
-    dup label>> calls>> push ;
-
-M: #recursive collect-label-info
-    label>> V{ } clone >>calls drop ;
-
-M: node collect-label-info drop ;
-
-! Rename
-SYMBOL: rename-map
-
-: rename-value ( value -- value' )
-    [ rename-map get at ] keep or ;
-
-: rename-values ( values -- values' )
-    rename-map get '[ [ , at ] keep or ] map ;
-
-GENERIC: rename-node-values* ( node -- node )
-
-M: #introduce rename-node-values* ;
-
-M: #shuffle rename-node-values*
-    [ rename-values ] change-in-d
-    [ [ rename-value ] assoc-map ] change-mapping ;
-
-M: #push rename-node-values* ;
-
-M: #r> rename-node-values*
-    [ rename-values ] change-in-r ;
-
-M: #terminate rename-node-values*
-    [ rename-values ] change-in-d
-    [ rename-values ] change-in-r ;
-
-M: #phi rename-node-values*
-    [ [ rename-values ] map ] change-phi-in-d ;
-
-M: #declare rename-node-values*
-    [ [ [ rename-value ] dip ] assoc-map ] change-declaration ;
-
-M: #alien-callback rename-node-values* ;
-
-M: node rename-node-values*
-    [ rename-values ] change-in-d ;
-
-: rename-node-values ( nodes -- nodes' )
-    dup [ rename-node-values* drop ] each-node ;
-
-! Normalize
 GENERIC: normalize* ( node -- node' )
 
 SYMBOL: introduction-stack
@@ -125,10 +37,6 @@ SYMBOL: introduction-stack
 : pop-introductions ( n -- values )
     introduction-stack [ swap cut* swap ] change ;
 
-: add-renamings ( old new -- )
-    [ rename-values ] dip
-    rename-map get '[ , set-at ] 2each ;
-
 M: #introduce normalize*
     out-d>> [ length pop-introductions ] keep add-renamings f ;
 
@@ -158,7 +66,7 @@ M: #branch normalize*
 
 M: #phi normalize*
     remaining-introductions get swap dup terminated>>
-    '[ , eliminate-phi-introductions ] change-phi-in-d ;
+    '[ _ eliminate-phi-introductions ] change-phi-in-d ;
 
 : (normalize) ( nodes introductions -- nodes )
     introduction-stack [
@@ -168,7 +76,7 @@ M: #phi normalize*
 M: #recursive normalize*
     dup label>> introductions>>
     [ drop [ child>> first ] [ in-d>> ] bi >>in-d drop ]
-    [ make-values '[ , (normalize) ] change-child ]
+    [ make-values '[ _ (normalize) ] change-child ]
     2bi ;
 
 M: #enter-recursive normalize*
@@ -181,14 +89,14 @@ M: #enter-recursive normalize*
 
 : call<return ( #call-recursive n -- nodes )
     neg dup make-values [
-        [ pop-introductions '[ , prepend ] change-in-d ]
-        [ '[ , prepend ] change-out-d ]
+        [ pop-introductions '[ _ prepend ] change-in-d ]
+        [ '[ _ prepend ] change-out-d ]
         bi*
     ] [ introduction-stack [ prepend ] change ] bi ;
 
 : call>return ( #call-recursive n -- #call-recursive )
-    [ [ [ in-d>> ] [ out-d>> ] bi ] [ '[ , head ] ] bi* bi@ add-renamings ]
-    [ '[ , tail ] [ change-in-d ] [ change-out-d ] bi ]
+    [ [ [ in-d>> ] [ out-d>> ] bi ] [ '[ _ head ] ] bi* bi@ add-renamings ]
+    [ '[ _ tail ] [ change-in-d ] [ change-out-d ] bi ]
     2bi ;
 
 M: #call-recursive normalize*
@@ -201,9 +109,8 @@ M: #call-recursive normalize*
 M: node normalize* ;
 
 : normalize ( nodes -- nodes' )
-    H{ } clone rename-map set
-    dup [ collect-label-info ] each-node
     dup count-introductions make-values
+    H{ } clone rename-map set
     [ (normalize) ] [ nip ] 2bi
     [ #introduce prefix ] unless-empty
     rename-node-values ;
diff --git a/basis/compiler/tree/normalization/renaming/renaming.factor b/basis/compiler/tree/normalization/renaming/renaming.factor
new file mode 100644
index 0000000000..3050df2611
--- /dev/null
+++ b/basis/compiler/tree/normalization/renaming/renaming.factor
@@ -0,0 +1,48 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: namespaces assocs kernel accessors sequences fry
+compiler.tree compiler.tree.combinators ;
+IN: compiler.tree.normalization.renaming
+
+SYMBOL: rename-map
+
+: rename-value ( value -- value' )
+    [ rename-map get at ] keep or ;
+
+: rename-values ( values -- values' )
+    rename-map get '[ [ _ at ] keep or ] map ;
+
+: add-renamings ( old new -- )
+    [ rename-values ] dip
+    rename-map get '[ _ set-at ] 2each ;
+
+GENERIC: rename-node-values* ( node -- node )
+
+M: #introduce rename-node-values* ;
+
+M: #shuffle rename-node-values*
+    [ rename-values ] change-in-d
+    [ [ rename-value ] assoc-map ] change-mapping ;
+
+M: #push rename-node-values* ;
+
+M: #r> rename-node-values*
+    [ rename-values ] change-in-r ;
+
+M: #terminate rename-node-values*
+    [ rename-values ] change-in-d
+    [ rename-values ] change-in-r ;
+
+M: #phi rename-node-values*
+    [ [ rename-values ] map ] change-phi-in-d ;
+
+M: #declare rename-node-values*
+    [ [ [ rename-value ] dip ] assoc-map ] change-declaration ;
+
+M: #alien-callback rename-node-values* ;
+
+M: node rename-node-values*
+    [ rename-values ] change-in-d ;
+
+: rename-node-values ( nodes -- nodes' )
+    dup [ rename-node-values* drop ] each-node ;
diff --git a/basis/compiler/tree/optimizer/optimizer.factor b/basis/compiler/tree/optimizer/optimizer.factor
index aafc7f137b..3196253d45 100644
--- a/basis/compiler/tree/optimizer/optimizer.factor
+++ b/basis/compiler/tree/optimizer/optimizer.factor
@@ -1,15 +1,16 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel namespaces
+compiler.tree.recursive
 compiler.tree.normalization
 compiler.tree.propagation
 compiler.tree.cleanup
 compiler.tree.escape-analysis
 compiler.tree.tuple-unboxing
+compiler.tree.identities
 compiler.tree.def-use
 compiler.tree.dead-code
 compiler.tree.strength-reduction
-compiler.tree.loop.detection
 compiler.tree.finalization
 compiler.tree.checker ;
 IN: compiler.tree.optimizer
@@ -17,12 +18,13 @@ IN: compiler.tree.optimizer
 SYMBOL: check-optimizer?
 
 : optimize-tree ( nodes -- nodes' )
+    analyze-recursive
     normalize
     propagate
     cleanup
-    detect-loops
     escape-analysis
     unbox-tuples
+    apply-identities
     compute-def-use
     remove-dead-code
     ! strength-reduce
diff --git a/basis/compiler/tree/propagation/branches/branches.factor b/basis/compiler/tree/propagation/branches/branches.factor
index f06f6792c7..c76217f8ae 100644
--- a/basis/compiler/tree/propagation/branches/branches.factor
+++ b/basis/compiler/tree/propagation/branches/branches.factor
@@ -32,7 +32,7 @@ M: #if live-branches
 
 M: #dispatch live-branches
     [ children>> length ] [ in-d>> first value-info interval>> ] bi
-    '[ , interval-contains? ] map ;
+    '[ _ interval-contains? ] map ;
 
 : live-children ( #branch -- children )
     [ children>> ] [ live-branches>> ] bi select-children ;
@@ -61,7 +61,7 @@ SYMBOL: infer-children-data
     infer-children-data get
     [
         '[
-            , [
+            _ [
                 dup +bottom+ eq?
                 [ drop null-info ] [ value-info ] if
             ] bind
diff --git a/basis/compiler/tree/propagation/inlining/inlining.factor b/basis/compiler/tree/propagation/inlining/inlining.factor
index 4f93769b7f..48864d8782 100644
--- a/basis/compiler/tree/propagation/inlining/inlining.factor
+++ b/basis/compiler/tree/propagation/inlining/inlining.factor
@@ -6,11 +6,20 @@ classes.algebra classes.union sets quotations assocs combinators
 words namespaces
 compiler.tree
 compiler.tree.builder
+compiler.tree.recursive
+compiler.tree.combinators
 compiler.tree.normalization
 compiler.tree.propagation.info
 compiler.tree.propagation.nodes ;
 IN: compiler.tree.propagation.inlining
 
+! We count nodes up-front; if there are relatively few nodes,
+! we are more eager to inline
+SYMBOL: node-count
+
+: count-nodes ( nodes -- )
+    0 swap [ drop 1+ ] each-node node-count set ;
+
 ! Splicing nodes
 GENERIC: splicing-nodes ( #call word/quot/f -- nodes )
 
@@ -18,7 +27,7 @@ M: word splicing-nodes
     [ [ in-d>> ] [ out-d>> ] bi ] dip #call 1array ;
 
 M: quotation splicing-nodes
-    build-sub-tree normalize ;
+    build-sub-tree analyze-recursive normalize ;
 
 : propagate-body ( #call -- )
     body>> (propagate) ;
@@ -113,12 +122,13 @@ DEFER: (flat-length)
     [ classes-known? 2 0 ? ]
     [
         {
+            [ drop node-count get 45 swap [-] 8 /i ]
             [ flat-length 24 swap [-] 4 /i ]
             [ "default" word-prop -4 0 ? ]
             [ "specializer" word-prop 1 0 ? ]
             [ method-body? 1 0 ? ]
         } cleave
-    ] bi* + + + + ;
+    ] bi* + + + + + ;
 
 : should-inline? ( #call word -- ? )
     inlining-rank 5 >= ;
diff --git a/basis/compiler/tree/propagation/known-words/known-words.factor b/basis/compiler/tree/propagation/known-words/known-words.factor
index d31de354d1..d208d31389 100644
--- a/basis/compiler/tree/propagation/known-words/known-words.factor
+++ b/basis/compiler/tree/propagation/known-words/known-words.factor
@@ -118,7 +118,7 @@ most-negative-fixnum most-positive-fixnum [a,b]
 
 : binary-op ( word interval-quot post-proc-quot -- )
     '[
-        [ binary-op-class ] [ , binary-op-interval ] 2bi
+        [ binary-op-class ] [ _ binary-op-interval ] 2bi
         @
         <class/interval-info>
     ] "outputs" set-word-prop ;
@@ -159,14 +159,14 @@ most-negative-fixnum most-positive-fixnum [a,b]
     in1 in2 op negate-comparison (comparison-constraints) out f--> /\ ;
 
 : define-comparison-constraints ( word op -- )
-    '[ , comparison-constraints ] "constraints" set-word-prop ;
+    '[ _ comparison-constraints ] "constraints" set-word-prop ;
 
 comparison-ops
-[ dup '[ , define-comparison-constraints ] each-derived-op ] each
+[ dup '[ _ define-comparison-constraints ] each-derived-op ] each
 
 generic-comparison-ops [
     dup specific-comparison
-    '[ , , define-comparison-constraints ] each-derived-op
+    '[ _ _ define-comparison-constraints ] each-derived-op
 ] each
 
 ! Remove redundant comparisons
@@ -179,13 +179,13 @@ generic-comparison-ops [
 
 comparison-ops [
     dup '[
-        [ , fold-comparison ] "outputs" set-word-prop
+        [ _ fold-comparison ] "outputs" set-word-prop
     ] each-derived-op
 ] each
 
 generic-comparison-ops [
     dup specific-comparison
-    '[ , fold-comparison ] "outputs" set-word-prop
+    '[ _ fold-comparison ] "outputs" set-word-prop
 ] each
 
 : maybe-or-never ( ? -- info )
@@ -221,7 +221,7 @@ generic-comparison-ops [
     { >float float }
 } [
     '[
-        ,
+        _
         [ nip ] [
             [ interval>> ] [ class-interval ] bi*
             interval-intersect
diff --git a/basis/compiler/tree/propagation/propagation-tests.factor b/basis/compiler/tree/propagation/propagation-tests.factor
index f04460f32a..a115ee53c2 100644
--- a/basis/compiler/tree/propagation/propagation-tests.factor
+++ b/basis/compiler/tree/propagation/propagation-tests.factor
@@ -1,5 +1,5 @@
 USING: kernel compiler.tree.builder compiler.tree
-compiler.tree.propagation
+compiler.tree.propagation compiler.tree.recursive
 compiler.tree.normalization tools.test math math.order
 accessors sequences arrays kernel.private vectors
 alien.accessors alien.c-types sequences.private
@@ -14,6 +14,7 @@ IN: compiler.tree.propagation.tests
 
 : final-info ( quot -- seq )
     build-tree
+    analyze-recursive
     normalize
     propagate
     compute-def-use
diff --git a/basis/compiler/tree/propagation/propagation.factor b/basis/compiler/tree/propagation/propagation.factor
index f184418d43..d82ebed433 100755
--- a/basis/compiler/tree/propagation/propagation.factor
+++ b/basis/compiler/tree/propagation/propagation.factor
@@ -6,6 +6,7 @@ compiler.tree.propagation.copy
 compiler.tree.propagation.info
 compiler.tree.propagation.nodes
 compiler.tree.propagation.simple
+compiler.tree.propagation.inlining
 compiler.tree.propagation.branches
 compiler.tree.propagation.recursive
 compiler.tree.propagation.constraints
@@ -18,4 +19,5 @@ IN: compiler.tree.propagation
     H{ } clone copies set
     H{ } clone constraints set
     H{ } clone value-infos set
+    dup count-nodes
     dup (propagate) ;
diff --git a/basis/compiler/tree/propagation/recursive/recursive.factor b/basis/compiler/tree/propagation/recursive/recursive.factor
index 649eaa763e..53dce813a3 100644
--- a/basis/compiler/tree/propagation/recursive/recursive.factor
+++ b/basis/compiler/tree/propagation/recursive/recursive.factor
@@ -70,7 +70,8 @@ M: #recursive propagate-around ( #recursive -- )
     [ generalize-return-interval ] map ;
 
 : return-infos ( node -- infos )
-    label>> return>> node-input-infos generalize-return ;
+    label>> [ return>> node-input-infos ] [ loop?>> ] bi
+    [ generalize-return ] unless ;
 
 M: #call-recursive propagate-before ( #call-recursive -- )
     [ ] [ return-infos ] [ node-output-infos ] tri
diff --git a/basis/compiler/tree/propagation/simple/simple.factor b/basis/compiler/tree/propagation/simple/simple.factor
index 809a85a51f..7fc38239f1 100644
--- a/basis/compiler/tree/propagation/simple/simple.factor
+++ b/basis/compiler/tree/propagation/simple/simple.factor
@@ -68,8 +68,8 @@ M: #declare propagate-before
     [ in-d>> [ value-info literal?>> ] all? ] [ drop f ] if ;
 
 : (fold-call) ( #call word -- info )
-    [ [ out-d>> ] [ in-d>> [ value-info literal>> ] map ] bi ] [ '[ , execute ] ] bi*
-    '[ , , with-datastack [ <literal-info> ] map nip ]
+    [ [ out-d>> ] [ in-d>> [ value-info literal>> ] map ] bi ] [ '[ _ execute ] ] bi*
+    '[ _ _ with-datastack [ <literal-info> ] map nip ]
     [ drop [ object-info ] replicate ]
     recover ;
 
diff --git a/basis/compiler/tree/loop/detection/detection-tests.factor b/basis/compiler/tree/recursive/recursive-tests.factor
similarity index 75%
rename from basis/compiler/tree/loop/detection/detection-tests.factor
rename to basis/compiler/tree/recursive/recursive-tests.factor
index 5864dc368f..c66c182869 100644
--- a/basis/compiler/tree/loop/detection/detection-tests.factor
+++ b/basis/compiler/tree/recursive/recursive-tests.factor
@@ -1,5 +1,5 @@
-IN: compiler.tree.loop.detection.tests
-USING: compiler.tree.loop.detection tools.test
+IN: compiler.tree.recursive.tests
+USING: compiler.tree.recursive tools.test
 kernel combinators.short-circuit math sequences accessors
 compiler.tree
 compiler.tree.builder
@@ -10,7 +10,7 @@ compiler.tree.combinators ;
 [ { f t t t } ] [ t { f f t t } (tail-calls) ] unit-test
 [ { f f f t } ] [ t { f f t f } (tail-calls) ] unit-test
 
-\ detect-loops must-infer
+\ analyze-recursive must-infer
 
 : label-is-loop? ( nodes word -- ? )
     [
@@ -38,22 +38,22 @@ compiler.tree.combinators ;
     dup [ 1+ loop-test-1 ] [ drop ] if ; inline recursive
                           
 [ t ] [
-    [ loop-test-1 ] build-tree detect-loops
+    [ loop-test-1 ] build-tree analyze-recursive
     \ loop-test-1 label-is-loop?
 ] unit-test
 
 [ t ] [
-    [ loop-test-1 1 2 3 ] build-tree detect-loops
+    [ loop-test-1 1 2 3 ] build-tree analyze-recursive
     \ loop-test-1 label-is-loop?
 ] unit-test
 
 [ t ] [
-    [ [ loop-test-1 ] each ] build-tree detect-loops
+    [ [ loop-test-1 ] each ] build-tree analyze-recursive
     \ loop-test-1 label-is-loop?
 ] unit-test
 
 [ t ] [
-    [ [ loop-test-1 ] each ] build-tree detect-loops
+    [ [ loop-test-1 ] each ] build-tree analyze-recursive
     \ (each-integer) label-is-loop?
 ] unit-test
 
@@ -61,7 +61,7 @@ compiler.tree.combinators ;
     dup [ 1+ loop-test-2 1- ] [ drop ] if ; inline recursive
 
 [ t ] [
-    [ loop-test-2 ] build-tree detect-loops
+    [ loop-test-2 ] build-tree analyze-recursive
     \ loop-test-2 label-is-not-loop?
 ] unit-test
 
@@ -69,7 +69,7 @@ compiler.tree.combinators ;
     dup [ [ loop-test-3 ] each ] [ drop ] if ; inline recursive
 
 [ t ] [
-    [ loop-test-3 ] build-tree detect-loops
+    [ loop-test-3 ] build-tree analyze-recursive
     \ loop-test-3 label-is-not-loop?
 ] unit-test
 
@@ -81,7 +81,7 @@ compiler.tree.combinators ;
     ] if ; inline recursive
 
 [ f ] [
-    [ [ [ ] map ] map ] build-tree detect-loops
+    [ [ [ ] map ] map ] build-tree analyze-recursive
     [
         dup #recursive? [ label>> loop?>> not ] [ drop f ] if
     ] contains-node?
@@ -98,22 +98,22 @@ DEFER: a
     blah [ b ] [ a ] if ; inline recursive
 
 [ t ] [
-    [ a ] build-tree detect-loops
+    [ a ] build-tree analyze-recursive
     \ a label-is-loop?
 ] unit-test
 
 [ t ] [
-    [ a ] build-tree detect-loops
+    [ a ] build-tree analyze-recursive
     \ b label-is-loop?
 ] unit-test
 
 [ t ] [
-    [ b ] build-tree detect-loops
+    [ b ] build-tree analyze-recursive
     \ a label-is-loop?
 ] unit-test
 
 [ t ] [
-    [ a ] build-tree detect-loops
+    [ a ] build-tree analyze-recursive
     \ b label-is-loop?
 ] unit-test
 
@@ -126,12 +126,12 @@ DEFER: a'
     blah [ b' ] [ a' ] if ; inline recursive
 
 [ f ] [
-    [ a' ] build-tree detect-loops
+    [ a' ] build-tree analyze-recursive
     \ a' label-is-loop?
 ] unit-test
 
 [ f ] [
-    [ b' ] build-tree detect-loops
+    [ b' ] build-tree analyze-recursive
     \ b' label-is-loop?
 ] unit-test
 
@@ -140,11 +140,11 @@ DEFER: a'
 ! sound.
 
 [ t ] [
-    [ b' ] build-tree detect-loops
+    [ b' ] build-tree analyze-recursive
     \ a' label-is-loop?
 ] unit-test
 
 [ f ] [
-    [ a' ] build-tree detect-loops
+    [ a' ] build-tree analyze-recursive
     \ b' label-is-loop?
 ] unit-test
diff --git a/basis/compiler/tree/loop/detection/detection.factor b/basis/compiler/tree/recursive/recursive.factor
similarity index 80%
rename from basis/compiler/tree/loop/detection/detection.factor
rename to basis/compiler/tree/recursive/recursive.factor
index 1f9e42530a..d1e4c7c70e 100644
--- a/basis/compiler/tree/loop/detection/detection.factor
+++ b/basis/compiler/tree/recursive/recursive.factor
@@ -1,14 +1,27 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences namespaces assocs accessors fry
-compiler.tree deques search-deques ;
-IN: compiler.tree.loop.detection
+USING: kernel assocs namespaces accessors sequences deques
+search-deques compiler.tree compiler.tree.combinators ;
+IN: compiler.tree.recursive
+
+! Collect label info
+GENERIC: collect-label-info ( node -- )
+
+M: #return-recursive collect-label-info
+    dup label>> (>>return) ;
+
+M: #call-recursive collect-label-info
+    dup label>> calls>> push ;
+
+M: #recursive collect-label-info
+    label>> V{ } clone >>calls drop ;
+
+M: node collect-label-info drop ;
 
 ! A loop is a #recursive which only tail calls itself, and those
 ! calls are nested inside other loops only. We optimistically
 ! assume all #recursive nodes are loops, disqualifying them as
 ! we see evidence to the contrary.
-
 : (tail-calls) ( tail? seq -- seq' )
     reverse [ swap [ and ] keep ] map nip reverse ;
 
@@ -84,5 +97,6 @@ M: node collect-loop-info* 2drop ;
         ] [ drop ] if
     ] slurp-deque ;
 
-: detect-loops ( nodes -- nodes )
+: analyze-recursive ( nodes -- nodes )
+    dup [ collect-label-info ] each-node
     dup collect-loop-info disqualify-loops ;
diff --git a/basis/compiler/tree/tree.factor b/basis/compiler/tree/tree.factor
index b6c798ca3c..05f33902ec 100755
--- a/basis/compiler/tree/tree.factor
+++ b/basis/compiler/tree/tree.factor
@@ -178,7 +178,7 @@ M: #return-recursive inputs/outputs [ in-d>> ] [ out-d>> ] bi ;
 
 : shuffle-effect ( #shuffle -- effect )
     [ in-d>> ] [ out-d>> ] [ mapping>> ] tri
-    '[ , at ] map
+    '[ _ at ] map
     <effect> ;
 
 : recursive-phi-in ( #enter-recursive -- seq )
diff --git a/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor b/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor
index 858e40347f..81ba01f1e2 100644
--- a/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor
+++ b/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor
@@ -1,16 +1,18 @@
 IN: compiler.tree.tuple-unboxing.tests
 USING: tools.test compiler.tree.tuple-unboxing compiler.tree
-compiler.tree.builder compiler.tree.normalization
-compiler.tree.propagation compiler.tree.cleanup
-compiler.tree.escape-analysis compiler.tree.tuple-unboxing
-compiler.tree.checker compiler.tree.def-use kernel accessors
-sequences math math.private sorting math.order binary-search
-sequences.private slots.private ;
+compiler.tree.builder compiler.tree.recursive
+compiler.tree.normalization compiler.tree.propagation
+compiler.tree.cleanup compiler.tree.escape-analysis
+compiler.tree.tuple-unboxing compiler.tree.checker
+compiler.tree.def-use kernel accessors sequences math
+math.private sorting math.order binary-search sequences.private
+slots.private ;
 
 \ unbox-tuples must-infer
 
 : test-unboxing ( quot -- )
     build-tree
+    analyze-recursive
     normalize
     propagate
     cleanup
diff --git a/basis/concurrency/messaging/messaging-tests.factor b/basis/concurrency/messaging/messaging-tests.factor
index 0f9f97c4cc..dd94ad15b3 100755
--- a/basis/concurrency/messaging/messaging-tests.factor
+++ b/basis/concurrency/messaging/messaging-tests.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2005 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
-!
-USING: kernel threads vectors arrays sequences
-namespaces tools.test continuations deques strings math words
-match quotations concurrency.messaging concurrency.mailboxes
+USING: kernel threads vectors arrays sequences namespaces make
+tools.test continuations deques strings math words match
+quotations concurrency.messaging concurrency.mailboxes
 concurrency.count-downs accessors ;
 IN: concurrency.messaging.tests
 
diff --git a/basis/core-foundation/fsevents/fsevents.factor b/basis/core-foundation/fsevents/fsevents.factor
index f14dba6433..bb21391f0a 100644
--- a/basis/core-foundation/fsevents/fsevents.factor
+++ b/basis/core-foundation/fsevents/fsevents.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.strings alien.syntax kernel
-math sequences namespaces assocs init accessors continuations
-combinators core-foundation core-foundation.run-loop
-io.encodings.utf8 destructors ;
+math sequences namespaces make assocs init accessors
+continuations combinators core-foundation
+core-foundation.run-loop io.encodings.utf8 destructors ;
 IN: core-foundation.fsevents
 
 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
diff --git a/basis/cpu/architecture/architecture.factor b/basis/cpu/architecture/architecture.factor
index fc11e0a731..432e748cbf 100755
--- a/basis/cpu/architecture/architecture.factor
+++ b/basis/cpu/architecture/architecture.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays generic kernel kernel.private math memory
-namespaces sequences layouts system hashtables classes alien
-byte-arrays combinators words sets ;
+namespaces make sequences layouts system hashtables classes
+alien byte-arrays combinators words sets ;
 IN: cpu.architecture
 
 ! Register classes
diff --git a/basis/cpu/ppc/architecture/architecture.factor b/basis/cpu/ppc/architecture/architecture.factor
index 0aee836cf1..12fbbea82e 100755
--- a/basis/cpu/ppc/architecture/architecture.factor
+++ b/basis/cpu/ppc/architecture/architecture.factor
@@ -5,7 +5,7 @@ cpu.architecture generic kernel kernel.private math memory
 namespaces sequences words assocs compiler.generator
 compiler.generator.registers compiler.generator.fixup system
 layouts classes words.private alien combinators
-compiler.constants math.order ;
+compiler.constants math.order make ;
 IN: cpu.ppc.architecture
 
 ! PowerPC register assignments
diff --git a/basis/cpu/ppc/assembler/assembler-tests.factor b/basis/cpu/ppc/assembler/assembler-tests.factor
index 9fdaaf712f..f35a5cfca8 100644
--- a/basis/cpu/ppc/assembler/assembler-tests.factor
+++ b/basis/cpu/ppc/assembler/assembler-tests.factor
@@ -1,6 +1,6 @@
 IN: cpu.ppc.assembler.tests
 USING: cpu.ppc.assembler tools.test arrays kernel namespaces
-vocabs sequences ;
+make vocabs sequences ;
 
 : test-assembler ( expected quot -- )
     [ 1array ] [ [ { } make ] curry ] bi* unit-test ;
diff --git a/basis/cpu/ppc/assembler/backend/backend.factor b/basis/cpu/ppc/assembler/backend/backend.factor
index b881f5a974..1b442662d5 100644
--- a/basis/cpu/ppc/assembler/backend/backend.factor
+++ b/basis/cpu/ppc/assembler/backend/backend.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: compiler.generator.fixup kernel namespaces sequences
+USING: compiler.generator.fixup kernel namespaces make sequences
 words math math.bitwise io.binary parser lexer ;
 IN: cpu.ppc.assembler.backend
 
diff --git a/basis/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor
index 6f255893db..67a8ec8a2c 100755
--- a/basis/cpu/x86/32/32.factor
+++ b/basis/cpu/x86/32/32.factor
@@ -173,6 +173,9 @@ M: x86.32 %box-long-long ( n func -- )
         [ (%box-long-long) ] [ f %alien-invoke ] bi*
     ] with-aligned-stack ;
 
+: struct-return@ ( size n -- n )
+    [ stack-frame* cell + + ] [ \ stack-frame get swap - ] ?if ;
+
 M: x86.32 %box-large-struct ( n size -- )
     ! Compute destination address
     [ swap struct-return@ ] keep
diff --git a/basis/cpu/x86/64/64.factor b/basis/cpu/x86/64/64.factor
index 6e864ab968..4770c09a83 100755
--- a/basis/cpu/x86/64/64.factor
+++ b/basis/cpu/x86/64/64.factor
@@ -3,9 +3,10 @@
 USING: accessors alien.c-types arrays cpu.x86.assembler
 cpu.x86.architecture cpu.x86.intrinsics cpu.x86.sse2
 cpu.x86.allot cpu.architecture kernel kernel.private math
-namespaces sequences compiler.generator compiler.generator.registers
-compiler.generator.fixup system layouts alien alien.accessors
-alien.structs slots splitting assocs ;
+namespaces make sequences compiler.generator
+compiler.generator.registers compiler.generator.fixup system
+layouts alien alien.accessors alien.structs slots splitting
+assocs ;
 IN: cpu.x86.64
 
 M: x86.64 ds-reg R14 ;
@@ -115,6 +116,9 @@ M: x86.64 %box-small-struct ( size -- )
     RDX swap MOV
     "box_small_struct" f %alien-invoke ;
 
+: struct-return@ ( size n -- n )
+    [ ] [ \ stack-frame get swap - ] ?if ;
+
 M: x86.64 %box-large-struct ( n size -- )
     ! Struct size is parameter 2
     RSI over MOV
diff --git a/basis/cpu/x86/architecture/architecture.factor b/basis/cpu/x86/architecture/architecture.factor
index 69bc685364..171e67bcfb 100755
--- a/basis/cpu/x86/architecture/architecture.factor
+++ b/basis/cpu/x86/architecture/architecture.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types arrays cpu.x86.assembler
 cpu.x86.assembler.private cpu.architecture kernel kernel.private
-math memory namespaces sequences words compiler.generator
+math memory namespaces make sequences words compiler.generator
 compiler.generator.registers compiler.generator.fixup system
 layouts combinators compiler.constants math.order ;
 IN: cpu.x86.architecture
@@ -141,13 +141,6 @@ M: x86 small-enough? ( n -- ? )
 
 : temp@ ( n -- op ) stack-reg \ stack-frame get rot - [+] ;
 
-: struct-return@ ( size n -- n )
-    [
-        stack-frame* cell + +
-    ] [
-        \ stack-frame get swap -
-    ] ?if ;
-
 HOOK: %unbox-struct-1 cpu ( -- )
 
 HOOK: %unbox-struct-2 cpu ( -- )
diff --git a/basis/cpu/x86/assembler/assembler-tests.factor b/basis/cpu/x86/assembler/assembler-tests.factor
index 4c0f04fcc2..941bbe5b73 100644
--- a/basis/cpu/x86/assembler/assembler-tests.factor
+++ b/basis/cpu/x86/assembler/assembler-tests.factor
@@ -1,4 +1,4 @@
-USING: cpu.x86.assembler kernel tools.test namespaces ;
+USING: cpu.x86.assembler kernel tools.test namespaces make ;
 IN: cpu.x86.assembler.tests
 
 [ { HEX: 49 HEX: 89 HEX: 04 HEX: 24 } ] [ [ R12 [] RAX MOV ] { } make ] unit-test
diff --git a/basis/cpu/x86/assembler/assembler.factor b/basis/cpu/x86/assembler/assembler.factor
index d9c25d8492..f557bb4adc 100755
--- a/basis/cpu/x86/assembler/assembler.factor
+++ b/basis/cpu/x86/assembler/assembler.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays compiler.generator.fixup io.binary kernel
-combinators kernel.private math namespaces sequences
+combinators kernel.private math namespaces make sequences
 words system layouts math.order accessors
 cpu.x86.assembler.syntax ;
 IN: cpu.x86.assembler
diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor
index 59a3f21863..133223b6e4 100644
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -4,7 +4,8 @@
 ! Simple CSV Parser
 ! Phil Dawes phil@phildawes.net
 
-USING: kernel sequences io namespaces combinators unicode.categories ;
+USING: kernel sequences io namespaces make
+combinators unicode.categories ;
 IN: csv
 
 SYMBOL: delimiter
diff --git a/basis/db/db-docs.factor b/basis/db/db-docs.factor
index 9395fcce32..f8e3956b3e 100644
--- a/basis/db/db-docs.factor
+++ b/basis/db/db-docs.factor
@@ -12,11 +12,11 @@ HELP: new-db
 { $description "Creates a new database object from a given class." } ;
 
 HELP: make-db*
-{ $values { "seq" sequence } { "db" object } { "db" object } }
+{ $values { "object" object } { "db" object } { "db" object } }
 { $description "Takes a sequence of parameters specific to each database and a class name of the database, and constructs a new database object." } ;
 
 HELP: make-db
-{ $values { "seq" sequence } { "class" class } { "db" db } }
+{ $values { "object" object } { "class" class } { "db" db } }
 { $description "Takes a sequence of parameters specific to each database and a class name of the database, and constructs a new database object." } ;
 
 HELP: db-open
diff --git a/basis/db/postgresql/postgresql.factor b/basis/db/postgresql/postgresql.factor
index ae31b168cb..38fa4cc715 100755
--- a/basis/db/postgresql/postgresql.factor
+++ b/basis/db/postgresql/postgresql.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs alien alien.syntax continuations io
-kernel math math.parser namespaces prettyprint quotations
+kernel math math.parser namespaces make prettyprint quotations
 sequences debugger db db.postgresql.lib db.postgresql.ffi
 db.tuples db.types tools.annotations math.ranges
 combinators classes locals words tools.walker
diff --git a/basis/db/queries/queries.factor b/basis/db/queries/queries.factor
index ede7612942..89c28b5262 100644
--- a/basis/db/queries/queries.factor
+++ b/basis/db/queries/queries.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel math namespaces sequences random strings
-math.parser math.intervals combinators math.bitwise nmake db
-db.tuples db.types db.sql classes words shuffle arrays destructors
-continuations ;
+USING: accessors kernel math namespaces make sequences random
+strings math.parser math.intervals combinators math.bitwise
+nmake db db.tuples db.types db.sql classes words shuffle arrays
+destructors continuations ;
 IN: db.queries
 
 GENERIC: where ( specs obj -- )
diff --git a/basis/db/tuples/tuples-docs.factor b/basis/db/tuples/tuples-docs.factor
index ed605da25f..26ecec0365 100644
--- a/basis/db/tuples/tuples-docs.factor
+++ b/basis/db/tuples/tuples-docs.factor
@@ -154,7 +154,7 @@ T{ book
 "Now we've created a book. Let's save it to the database."
 { $code <" USING: db db.sqlite fry io.files ;
 : with-book-tutorial ( quot -- )
-     '[ "book-tutorial.db" temp-file sqlite-db , with-db ] call ;
+     '[ "book-tutorial.db" temp-file sqlite-db _ with-db ] call ;
 
 [
     book recreate-table
diff --git a/basis/db/tuples/tuples-tests.factor b/basis/db/tuples/tuples-tests.factor
index 3b04454995..67e46f9e18 100755
--- a/basis/db/tuples/tuples-tests.factor
+++ b/basis/db/tuples/tuples-tests.factor
@@ -201,10 +201,10 @@ TUPLE: annotation n paste-id summary author mode contents ;
 ! ] with-db
 
 : test-sqlite ( quot -- )
-    [ ] swap '[ "tuples-test.db" temp-file sqlite-db , with-db ] unit-test ;
+    [ ] swap '[ "tuples-test.db" temp-file sqlite-db _ with-db ] unit-test ;
 
 : test-postgresql ( quot -- )
-    [ ] swap '[ { "localhost" "postgres" "foob" "factor-test" } postgresql-db , with-db ] unit-test ;
+    [ ] swap '[ { "localhost" "postgres" "foob" "factor-test" } postgresql-db _ with-db ] unit-test ;
 
 : test-repeated-insert
     [ ] [ person ensure-table ] unit-test
diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index 4d01567131..b7fd34c5be 100755
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: slots arrays definitions generic hashtables summary io
-kernel math namespaces prettyprint prettyprint.config sequences
-assocs sequences.private strings io.styles io.files vectors
-words system splitting math.parser classes.tuple continuations
-continuations.private combinators generic.math classes.builtin
-classes compiler.units generic.standard vocabs init
-kernel.private io.encodings accessors math.order
+kernel math namespaces make prettyprint prettyprint.config
+sequences assocs sequences.private strings io.styles io.files
+vectors words system splitting math.parser classes.tuple
+continuations continuations.private combinators generic.math
+classes.builtin classes compiler.units generic.standard vocabs
+init kernel.private io.encodings accessors math.order
 destructors source-files parser classes.tuple.parser
 effects.parser lexer compiler.errors generic.parser
 strings.parser ;
diff --git a/basis/debugger/threads/threads.factor b/basis/debugger/threads/threads.factor
index 7bb240859e..27ffdc629b 100644
--- a/basis/debugger/threads/threads.factor
+++ b/basis/debugger/threads/threads.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors debugger continuations threads threads.private
-io io.styles prettyprint kernel math.parser namespaces ;
+io io.styles prettyprint kernel math.parser namespaces make ;
 IN: debugger.threads
 
 : error-in-thread. ( thread -- )
diff --git a/basis/delegate/delegate.factor b/basis/delegate/delegate.factor
index fd9b9977e1..45cc214792 100755
--- a/basis/delegate/delegate.factor
+++ b/basis/delegate/delegate.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors parser generic kernel classes classes.tuple
 words slots assocs sequences arrays vectors definitions
-prettyprint math hashtables sets macros namespaces ;
+prettyprint math hashtables sets macros namespaces make ;
 IN: delegate
 
 : protocol-words ( protocol -- words )
diff --git a/basis/disjoint-sets/disjoint-sets.factor b/basis/disjoint-sets/disjoint-sets.factor
index 4ef787d33b..ea246cfa28 100644
--- a/basis/disjoint-sets/disjoint-sets.factor
+++ b/basis/disjoint-sets/disjoint-sets.factor
@@ -64,7 +64,7 @@ M: disjoint-set add-atom
     [ 1 -rot counts>> set-at ]
     2tri ;
 
-: add-atoms ( seq disjoint-set -- ) '[ , add-atom ] each ;
+: add-atoms ( seq disjoint-set -- ) '[ _ add-atom ] each ;
 
 GENERIC: disjoint-set-member? ( a disjoint-set -- ? )
 
@@ -89,7 +89,7 @@ M:: disjoint-set equate ( a b disjoint-set -- )
     ] if ;
 
 : equate-all-with ( seq a disjoint-set -- )
-    '[ , , equate ] each ;
+    '[ _ _ equate ] each ;
 
 : equate-all ( seq disjoint-set -- )
     over empty? [ 2drop ] [
@@ -102,7 +102,7 @@ M: disjoint-set clone
 
 : assoc>disjoint-set ( assoc -- disjoint-set )
     <disjoint-set>
-    [ '[ drop , add-atom ] assoc-each ]
-    [ '[ , equate ] assoc-each ]
+    [ '[ drop _ add-atom ] assoc-each ]
+    [ '[ _ equate ] assoc-each ]
     [ nip ]
     2tri ;
diff --git a/basis/documents/documents.factor b/basis/documents/documents.factor
index cac7574e35..54bc85284a 100755
--- a/basis/documents/documents.factor
+++ b/basis/documents/documents.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2007 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays io kernel math models namespaces
+USING: accessors arrays io kernel math models namespaces make
 sequences strings splitting combinators unicode.categories
 math.order ;
 IN: documents
diff --git a/basis/fry/fry-docs.factor b/basis/fry/fry-docs.factor
index 05cde62c1f..286dbb469e 100755
--- a/basis/fry/fry-docs.factor
+++ b/basis/fry/fry-docs.factor
@@ -1,15 +1,12 @@
 USING: help.markup help.syntax quotations kernel ;
 IN: fry
 
-HELP: ,
+HELP: _
 { $description "Fry specifier. Inserts a literal value into the fried quotation." } ;
 
 HELP: @
 { $description "Fry specifier. Splices a quotation into the fried quotation." } ;
 
-HELP: _
-{ $description "Fry specifier. Shifts all fry specifiers to the left down by one stack position." } ;
-
 HELP: fry
 { $values { "quot" quotation } { "quot'" quotation } }
 { $description "Outputs a quotation that when called, fries " { $snippet "quot" } " by taking values from the stack and substituting them in." }
@@ -19,7 +16,7 @@ HELP: fry
 
 HELP: '[
 { $syntax "code... ]" }
-{ $description "Literal fried quotation. Expands into code which takes values from the stack and substitutes them in place of the fry specifiers " { $link , } " and " { $link @ } "." }
+{ $description "Literal fried quotation. Expands into code which takes values from the stack and substitutes them in place of the fry specifiers " { $link _ } " and " { $link @ } "." }
 { $examples "See " { $link "fry.examples" } "." } ;
 
 ARTICLE: "fry.examples" "Examples of fried quotations"
@@ -27,69 +24,50 @@ ARTICLE: "fry.examples" "Examples of fried quotations"
 $nl
 "If a quotation does not contain any fry specifiers, then " { $link POSTPONE: '[ } " behaves just like " { $link POSTPONE: [ } ":"
 { $code "{ 10 20 30 } '[ . ] each" }
-"Occurrences of " { $link , } " on the left map directly to " { $link curry } ". That is, the following three lines are equivalent:"
+"Occurrences of " { $link _ } " on the left map directly to " { $link curry } ". That is, the following three lines are equivalent:"
 { $code 
-    "{ 10 20 30 } 5 '[ , + ] map"
+    "{ 10 20 30 } 5 '[ _ + ] map"
     "{ 10 20 30 } 5 [ + ] curry map"
     "{ 10 20 30 } [ 5 + ] map"
 }
-"Occurrences of " { $link , } " in the middle of a quotation map to more complex quotation composition patterns. The following three lines are equivalent:"
+"Occurrences of " { $link _ } " in the middle of a quotation map to more complex quotation composition patterns. The following three lines are equivalent:"
 { $code 
-    "{ 10 20 30 } 5 '[ 3 , / ] map"
+    "{ 10 20 30 } 5 '[ 3 _ / ] map"
     "{ 10 20 30 } 5 [ 3 ] swap [ / ] curry compose map"
     "{ 10 20 30 } [ 3 5 / ] map"
 }
-"Occurrences of " { $link @ } " are simply syntax sugar for " { $snippet ", call" } ". The following four lines are equivalent:"
+"Occurrences of " { $link @ } " are simply syntax sugar for " { $snippet "_ call" } ". The following four lines are equivalent:"
 { $code 
     "{ 10 20 30 } [ sq ] '[ @ . ] each"
     "{ 10 20 30 } [ sq ] [ call . ] curry each"
     "{ 10 20 30 } [ sq ] [ . ] compose each"
     "{ 10 20 30 } [ sq . ] each"
 }
-"The " { $link , } " and " { $link @ } " specifiers may be freely mixed:"
+"The " { $link _ } " and " { $link @ } " specifiers may be freely mixed:"
 { $code
-    "{ 8 13 14 27 } [ even? ] 5 '[ @ dup , ? ] map"
+    "{ 8 13 14 27 } [ even? ] 5 '[ @ dup _ ? ] map"
     "{ 8 13 14 27 } [ even? ] 5 [ dup ] swap [ ? ] curry 3compose map"
     "{ 8 13 14 27 } [ even? dup 5 ? ] map"
 }
-"Occurrences of " { $link _ } " have the effect of enclosing all code to their left in a quotation passed to " { $link dip } ". The following four lines are equivalent:"
-{ $code 
-    "{ 10 20 30 } 1 '[ , _ / ] map"
-    "{ 10 20 30 } 1 [ [ ] curry dip / ] curry map"
-    "{ 10 20 30 } 1 [ swap / ] curry map"
-    "{ 10 20 30 } [ 1 swap / ] map"
-}
-"For any quotation body " { $snippet "X" } ", the following two are equivalent:"
-{ $code
-    "[ [ X ] dip ]"
-    "'[ X _ ]"
-}
 "Here are some built-in combinators rewritten in terms of fried quotations:"
 { $table
-    { { $link literalize } { $snippet ": literalize '[ , ] ;" } }
-    { { $link slip } { $snippet ": slip '[ @ , ] call ;" } }
-    { { $link dip } { $snippet ": dip '[ @ _ ] call ;" } }
-    { { $link curry } { $snippet ": curry '[ , @ ] ;" } }
-    { { $link with } { $snippet ": with swapd '[ , _ @ ] ;" } }
+    { { $link literalize } { $snippet ": literalize '[ _ ] ;" } }
+    { { $link slip } { $snippet ": slip '[ @ _ ] call ;" } }
+    { { $link curry } { $snippet ": curry '[ _ @ ] ;" } }
     { { $link compose } { $snippet ": compose '[ @ @ ] ;" } }
-    { { $link bi@ } { $snippet ": bi@ tuck '[ , @ , @ ] call ;" } }
+    { { $link bi@ } { $snippet ": bi@ tuck '[ _ @ _ @ ] call ;" } }
 } ;
 
 ARTICLE: "fry.philosophy" "Fried quotation philosophy"
 "Fried quotations generalize quotation-building words such as " { $link curry } " and " { $link compose } ". They can clean up code with lots of currying and composition, particularly when quotations are nested:"
 { $code
-    "'[ [ , key? ] all? ] filter"
+    "'[ [ _ key? ] all? ] filter"
     "[ [ key? ] curry all? ] curry filter"
 }
 "There is a mapping from fried quotations to lexical closures as defined in the " { $vocab-link "locals" } " vocabulary. Namely, a fried quotation is equivalent to a ``let'' form where each local binding is only used once, and bindings are used in the same order in which they are defined. The following two lines are equivalent:"
 { $code
-    "'[ 3 , + 4 , / ]"
+    "'[ 3 _ + 4 _ / ]"
     "[let | a [ ] b [ ] | [ 3 a + 4 b / ] ]"
-}
-"The " { $link _ } " fry specifier has no direct analogue in " { $vocab-link "locals" } ", however closure conversion together with the " { $link dip } " combinator achieve the same effect:"
-{ $code
-    "'[ , 2 + , * _ / ]"
-    "[let | a [ ] b [ ] | [ [ a 2 + b * ] dip / ] ]"
 } ;
 
 ARTICLE: "fry.limitations" "Fried quotation limitations"
@@ -101,9 +79,8 @@ $nl
 "Fried quotations are denoted with a special parsing word:"
 { $subsection POSTPONE: '[ }
 "Fried quotations contain zero or more " { $emphasis "fry specifiers" } ":"
-{ $subsection , }
-{ $subsection @ }
 { $subsection _ }
+{ $subsection @ }
 "When a fried quotation is being evaluated, values are consumed from the stack and spliced into the quotation from right to left."
 { $subsection "fry.examples" }
 { $subsection "fry.philosophy" }
diff --git a/basis/fry/fry-tests.factor b/basis/fry/fry-tests.factor
index 6d6abba23c..d4a3b8b734 100755
--- a/basis/fry/fry-tests.factor
+++ b/basis/fry/fry-tests.factor
@@ -2,63 +2,59 @@ IN: fry.tests
 USING: fry tools.test math prettyprint kernel io arrays
 sequences ;
 
-[ [ 3 + ] ] [ 3 '[ , + ] ] unit-test
+[ [ 3 + ] ] [ 3 '[ _ + ] ] unit-test
 
-[ [ 1 3 + ] ] [ 1 3 '[ , , + ] ] unit-test
+[ [ 1 3 + ] ] [ 1 3 '[ _ _ + ] ] unit-test
 
-[ [ 1 + ] ] [ 1 [ + ] '[ , @ ] ] unit-test
+[ [ 1 + ] ] [ 1 [ + ] '[ _ @ ] ] unit-test
 
-[ [ 1 + . ] ] [ 1 [ + ] '[ , @ . ] ] unit-test
+[ [ 1 + . ] ] [ 1 [ + ] '[ _ @ . ] ] unit-test
 
 [ [ + - ] ] [ [ + ] [ - ] '[ @ @ ] ] unit-test
 
 [ [ "a" write "b" print ] ]
-[ "a" "b" '[ , write , print ] ] unit-test
+[ "a" "b" '[ _ write _ print ] ] unit-test
 
 [ [ 1 2 + 3 4 - ] ]
 [ [ + ] [ - ] '[ 1 2 @ 3 4 @ ] ] unit-test
 
 [ 1/2 ] [
-    1 '[ , _ / ] 2 swap call
+    1 '[ [ _ ] dip / ] 2 swap call
 ] unit-test
 
 [ { { 1 "a" "A" } { 1 "b" "B" } { 1 "c" "C" } } ] [
-    1 '[ , _ _ 3array ]
+    1 '[ [ _ ] 2dip 3array ]
     { "a" "b" "c" } { "A" "B" "C" } rot 2map
 ] unit-test
 
 [ { { 1 "a" } { 1 "b" } { 1 "c" } } ] [
-    '[ 1 _ 2array ]
+    '[ [ 1 ] dip 2array ]
     { "a" "b" "c" } swap map
 ] unit-test
 
-[ 1 2 ] [
-    1 2 '[ _ , ] call
-] unit-test
-
 [ { { 1 "a" 2 } { 1 "b" 2 } { 1 "c" 2 } } ] [
-    1 2 '[ , _ , 3array ]
+    1 2 '[ [ _ ] dip _ 3array ]
     { "a" "b" "c" } swap map
 ] unit-test
 
-: funny-dip '[ @ _ ] call ; inline
+: funny-dip '[ [ @ ] dip ] call ; inline
 
 [ "hi" 3 ] [ "h" "i" 3 [ append ] funny-dip ] unit-test
 
 [ { 1 2 3 } ] [
-    3 1 '[ , [ , + ] map ] call
+    3 1 '[ _ [ _ + ] map ] call
 ] unit-test
 
 [ { 1 { 2 { 3 } } } ] [
-    1 2 3 '[ , [ , [ , 1array ] call 2array ] call 2array ] call
+    1 2 3 '[ _ [ _ [ _ 1array ] call 2array ] call 2array ] call
 ] unit-test
 
-{ 1 1 } [ '[ [ [ , ] ] ] ] must-infer-as
+{ 1 1 } [ '[ [ [ _ ] ] ] ] must-infer-as
 
 [ { { { 3 } } } ] [
-    3 '[ [ [ , 1array ] call 1array ] call 1array ] call
+    3 '[ [ [ _ 1array ] call 1array ] call 1array ] call
 ] unit-test
 
 [ { { { 3 } } } ] [
-    3 '[ [ [ , 1array ] call 1array ] call 1array ] call
+    3 '[ [ [ _ 1array ] call 1array ] call 1array ] call
 ] unit-test
diff --git a/basis/fry/fry.factor b/basis/fry/fry.factor
index 2b84d58d06..395d5c3caf 100755
--- a/basis/fry/fry.factor
+++ b/basis/fry/fry.factor
@@ -1,13 +1,13 @@
 ! Copyright (C) 2008 Slava Pestov, Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel sequences combinators parser splitting math
-quotations arrays namespaces qualified ;
-QUALIFIED: namespaces
+quotations arrays make qualified words ;
 IN: fry
 
-: , ( -- * ) "Only valid inside a fry" throw ;
-: @ ( -- * ) "Only valid inside a fry" throw ;
 : _ ( -- * ) "Only valid inside a fry" throw ;
+: @ ( -- * ) "Only valid inside a fry" throw ;
+
+<PRIVATE
 
 DEFER: (shallow-fry)
 DEFER: shallow-fry
@@ -19,48 +19,33 @@ DEFER: shallow-fry
     ] unless-empty ; inline
 
 : (shallow-fry) ( accum quot -- result )
-    [
-        1quotation
-    ] [
+    [ 1quotation ] [
         unclip {
-            { \ , [ [ curry ] ((shallow-fry)) ] }
+            { \ _ [ [ curry ] ((shallow-fry)) ] }
             { \ @ [ [ compose ] ((shallow-fry)) ] }
-
-            ! to avoid confusion, remove if fry goes core
-            { \ namespaces:, [ [ curry ] ((shallow-fry)) ] }
-
             [ swap >r suffix r> (shallow-fry) ]
         } case
     ] if-empty ;
 
 : shallow-fry ( quot -- quot' ) [ ] swap (shallow-fry) ;
 
-: deep-fry ( quot -- quot )
-    { _ } last-split1 dup [
-      shallow-fry [ >r ] rot
-      deep-fry    [ [ dip ] curry r> compose ] 4array concat
-    ] [
-        drop shallow-fry
-    ] if ;
+PREDICATE: fry-specifier < word { _ @ } memq? ;
 
-: fry-specifier? ( obj -- ? ) { , namespaces:, @ } member? ;
+GENERIC: count-inputs ( quot -- n )
+
+M: callable count-inputs [ count-inputs ] sigma ;
+M: fry-specifier count-inputs drop 1 ;
+M: object count-inputs drop 0 ;
+
+PRIVATE>
 
-: count-inputs ( quot -- n )
-    [
-        {
-            { [ dup callable?      ] [ count-inputs ] }
-            { [ dup fry-specifier? ] [ drop 1       ] }
-                                     [ drop 0       ]
-        } cond
-    ] map sum ;
-    
 : fry ( quot -- quot' )
     [
         [
             dup callable? [
-                [ count-inputs \ , <repetition> % ] [ fry % ] bi
-            ] [ namespaces:, ] if
+                [ count-inputs \ _ <repetition> % ] [ fry % ] bi
+            ] [ , ] if
         ] each
-    ] [ ] make deep-fry ;
+    ] [ ] make shallow-fry ;
 
 : '[ \ ] parse-until fry over push-all ; parsing
diff --git a/basis/furnace/actions/actions.factor b/basis/furnace/actions/actions.factor
index 1370ae95b2..cce098f208 100755
--- a/basis/furnace/actions/actions.factor
+++ b/basis/furnace/actions/actions.factor
@@ -60,7 +60,7 @@ TUPLE: action rest authorize init display validate submit ;
 
 : handle-get ( action -- response )
     '[
-        , dup display>> [
+        _ dup display>> [
             {
                 [ init>> call ]
                 [ authorize>> call ]
@@ -90,7 +90,7 @@ TUPLE: action rest authorize init display validate submit ;
 
 : handle-post ( action -- response )
     '[
-        , dup submit>> [
+        _ dup submit>> [
             [ validate>> call ]
             [ authorize>> call ]
             [ submit>> call ]
@@ -133,4 +133,4 @@ TUPLE: page-action < action template ;
 
 : <page-action> ( -- page )
     page-action new-action
-        dup '[ , template>> <chloe-content> ] >>display ;
+        dup '[ _ template>> <chloe-content> ] >>display ;
diff --git a/basis/furnace/alloy/alloy.factor b/basis/furnace/alloy/alloy.factor
index 29cb37b557..6f5f6fdbf6 100644
--- a/basis/furnace/alloy/alloy.factor
+++ b/basis/furnace/alloy/alloy.factor
@@ -14,7 +14,7 @@ IN: furnace.alloy
     '[
         <conversations>
         <sessions>
-        , , <db-persistence>
+        _ _ <db-persistence>
         <check-form-submissions>
     ] call ;
 
@@ -26,5 +26,5 @@ IN: furnace.alloy
 
 : start-expiring ( db params -- )
     '[
-        , , [ state-classes [ expire-state ] each ] with-db
+        _ _ [ state-classes [ expire-state ] each ] with-db
     ] 5 minutes every drop ;
diff --git a/basis/furnace/auth/auth.factor b/basis/furnace/auth/auth.factor
index 54e936a313..8e18c18df9 100755
--- a/basis/furnace/auth/auth.factor
+++ b/basis/furnace/auth/auth.factor
@@ -125,7 +125,7 @@ TUPLE: secure-realm-only < filter-responder ;
 C: <secure-realm-only> secure-realm-only
 
 M: secure-realm-only call-responder*
-    '[ , , call-next-method ] if-secure-realm ;
+    '[ _ _ call-next-method ] if-secure-realm ;
 
 TUPLE: protected < filter-responder description capabilities ;
 
diff --git a/basis/furnace/auth/basic/basic.factor b/basis/furnace/auth/basic/basic.factor
index ff3c302b40..a9b367c5c9 100755
--- a/basis/furnace/auth/basic/basic.factor
+++ b/basis/furnace/auth/basic/basic.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel splitting base64 namespaces strings
+USING: accessors kernel splitting base64 namespaces make strings
 http http.server.responses furnace.auth ;
 IN: furnace.auth.basic
 
diff --git a/basis/furnace/auth/features/recover-password/recover-password.factor b/basis/furnace/auth/features/recover-password/recover-password.factor
index 77915f1083..a0fd05c6d4 100644
--- a/basis/furnace/auth/features/recover-password/recover-password.factor
+++ b/basis/furnace/auth/features/recover-password/recover-password.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces accessors kernel assocs arrays io.sockets threads
-fry urls smtp validators html.forms present
+USING: namespaces make accessors kernel assocs arrays io.sockets
+threads fry urls smtp validators html.forms present
 http http.server.responses http.server.redirection
 http.server.dispatchers
 furnace furnace.actions furnace.auth furnace.auth.providers
@@ -43,7 +43,7 @@ SYMBOL: lost-password-from
         ] "" make >>body ;
 
 : send-password-email ( user -- )
-    '[ , password-email send-email ]
+    '[ _ password-email send-email ]
     "E-mail send thread" spawn drop ;
 
 : <recover-action-1> ( -- action )
diff --git a/basis/furnace/chloe-tags/chloe-tags.factor b/basis/furnace/chloe-tags/chloe-tags.factor
index 8822bca519..4e619ad534 100644
--- a/basis/furnace/chloe-tags/chloe-tags.factor
+++ b/basis/furnace/chloe-tags/chloe-tags.factor
@@ -56,7 +56,7 @@ CHLOE: write-atom drop [ write-atom-feeds ] [code] ;
 
 : compile-link-attrs ( tag -- )
     #! Side-effects current namespace.
-    attrs>> '[ [ , _ link-attr ] each-responder ] [code] ;
+    attrs>> '[ [ [ _ ] dip link-attr ] each-responder ] [code] ;
 
 : a-start-tag ( tag -- )
     [ compile-link-attrs ] [ compile-a-url ] bi
@@ -72,7 +72,7 @@ CHLOE: a
 
 : compile-hidden-form-fields ( for -- )
     '[
-        , [ "," split [ hidden render ] each ] when*
+        _ [ "," split [ hidden render ] each ] when*
         nested-forms get " " join f like nested-forms-key hidden-form-field
         [ modify-form ] each-responder
     ] [code] ;
diff --git a/basis/furnace/conversations/conversations.factor b/basis/furnace/conversations/conversations.factor
index 26b62f9b07..1c28193de8 100644
--- a/basis/furnace/conversations/conversations.factor
+++ b/basis/furnace/conversations/conversations.factor
@@ -109,8 +109,8 @@ M: conversations call-responder*
 : restore-conversation ( seq -- )
     conversation get dup [
         namespace>>
-        [ '[ , key? ] filter ]
-        [ '[ [ , at ] keep set ] each ]
+        [ '[ _ key? ] filter ]
+        [ '[ [ _ at ] keep set ] each ]
         bi
     ] [ 2drop ] if ;
 
diff --git a/basis/furnace/furnace.factor b/basis/furnace/furnace.factor
index b90587fba8..6a798abb9f 100644
--- a/basis/furnace/furnace.factor
+++ b/basis/furnace/furnace.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces assocs sequences kernel classes splitting
+USING: namespaces make assocs sequences kernel classes splitting
 vocabs.loader accessors strings combinators arrays
 continuations present fry
 urls html.elements
diff --git a/basis/furnace/redirection/redirection.factor b/basis/furnace/redirection/redirection.factor
index 942cafd21a..ff3ce951cb 100644
--- a/basis/furnace/redirection/redirection.factor
+++ b/basis/furnace/redirection/redirection.factor
@@ -42,4 +42,4 @@ C: <secure-only> secure-only
     } cond ; inline
 
 M: secure-only call-responder*
-    '[ , , call-next-method ] if-secure ;
+    '[ _ _ call-next-method ] if-secure ;
diff --git a/basis/furnace/sessions/sessions-tests.factor b/basis/furnace/sessions/sessions-tests.factor
index 98d1bbdfc9..ff089a92b2 100755
--- a/basis/furnace/sessions/sessions-tests.factor
+++ b/basis/furnace/sessions/sessions-tests.factor
@@ -1,10 +1,9 @@
 IN: furnace.sessions.tests
-USING: tools.test http furnace.sessions
-furnace.actions http.server http.server.responses
-math namespaces kernel accessors io.sockets io.servers.connection
-prettyprint io.streams.string io.files splitting destructors
-sequences db db.tuples db.sqlite continuations urls math.parser
-furnace ;
+USING: tools.test http furnace.sessions furnace.actions
+http.server http.server.responses math namespaces make kernel
+accessors io.sockets io.servers.connection prettyprint
+io.streams.string io.files splitting destructors sequences db
+db.tuples db.sqlite continuations urls math.parser furnace ;
 
 : with-session
     [
diff --git a/basis/furnace/syndication/syndication.factor b/basis/furnace/syndication/syndication.factor
index 31a978aef3..396296bfac 100644
--- a/basis/furnace/syndication/syndication.factor
+++ b/basis/furnace/syndication/syndication.factor
@@ -44,7 +44,7 @@ TUPLE: feed-action < action title url entries ;
     feed-action new-action
         dup '[
             feed new
-                ,
+                _
                 [ title>> call >>title ]
                 [ url>> call adjust-url relative-to-request >>url ]
                 [ entries>> call process-entries >>entries ]
diff --git a/basis/generalizations/generalizations.factor b/basis/generalizations/generalizations.factor
index c97e9c7b91..069d59cee1 100755
--- a/basis/generalizations/generalizations.factor
+++ b/basis/generalizations/generalizations.factor
@@ -6,24 +6,24 @@ math.ranges combinators macros quotations fry arrays ;
 IN: generalizations
 
 MACRO: nsequence ( n seq -- quot )
-    [ drop <reversed> ] [ '[ , , new-sequence ] ] 2bi
-    [ '[ @ [ , swap set-nth-unsafe ] keep ] ] reduce ;
+    [ drop <reversed> ] [ '[ _ _ new-sequence ] ] 2bi
+    [ '[ @ [ _ swap set-nth-unsafe ] keep ] ] reduce ;
 
 MACRO: narray ( n -- quot )
-    '[ , { } nsequence ] ;
+    '[ _ { } nsequence ] ;
 
 MACRO: firstn ( n -- )
     dup zero? [ drop [ drop ] ] [
-        [ [ '[ , _ nth-unsafe ] ] map ]
-        [ 1- '[ , _ bounds-check 2drop ] ]
-        bi prefix '[ , cleave ]
+        [ [ '[ [ _ ] dip nth-unsafe ] ] map ]
+        [ 1- '[ [ _ ] dip bounds-check 2drop ] ]
+        bi prefix '[ _ cleave ]
     ] if ;
 
 MACRO: npick ( n -- )
     1- dup saver [ dup ] rot [ r> swap ] n*quot 3append ;
 
 MACRO: ndup ( n -- )
-    dup '[ , npick ] n*quot ;
+    dup '[ _ npick ] n*quot ;
 
 MACRO: nrot ( n -- )
     1- dup saver swap [ r> swap ] n*quot append ;
@@ -41,7 +41,7 @@ MACRO: ntuck ( n -- )
     2 + [ dupd -nrot ] curry ;
 
 MACRO: nrev ( n -- quot )
-    1 [a,b] [ ] [ '[ @ , -nrot ] ] reduce ;
+    1 [a,b] [ ] [ '[ @ _ -nrot ] ] reduce ;
 
 MACRO: ndip ( quot n -- )
     dup saver -rot restorer 3append ;
@@ -51,7 +51,7 @@ MACRO: nslip ( n -- )
 
 MACRO: nkeep ( n -- )
     [ ] [ 1+ ] [ ] tri
-    '[ [ , ndup ] dip , -nrot , nslip ] ;
+    '[ [ _ ndup ] dip _ -nrot _ nslip ] ;
 
 MACRO: ncurry ( n -- )
     [ curry ] n*quot ;
@@ -61,5 +61,5 @@ MACRO: nwith ( n -- )
 
 MACRO: napply ( n -- )
     2 [a,b]
-    [ [ 1- ] keep '[ , ntuck , nslip ] ]
+    [ [ 1- ] keep '[ _ ntuck _ nslip ] ]
     map concat >quotation [ call ] append ;
diff --git a/basis/help/handbook/handbook.factor b/basis/help/handbook/handbook.factor
index 1b488b1d48..9d57e758c1 100755
--- a/basis/help/handbook/handbook.factor
+++ b/basis/help/handbook/handbook.factor
@@ -108,6 +108,7 @@ USE: io.buffers
 ARTICLE: "collections" "Collections" 
 { $heading "Sequences" }
 { $subsection "sequences" }
+{ $subsection "namespaces-make" }
 "Fixed-length sequences:"
 { $subsection "arrays" }
 { $subsection "quotations" }
diff --git a/basis/help/help.factor b/basis/help/help.factor
index b2fff22372..686578f1b6 100755
--- a/basis/help/help.factor
+++ b/basis/help/help.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays io io.styles kernel namespaces parser
-prettyprint sequences words assocs definitions generic
+USING: accessors arrays io io.styles kernel namespaces make
+parser prettyprint sequences words assocs definitions generic
 quotations effects slots continuations classes.tuple debugger
 combinators vocabs help.stylesheet help.topics help.crossref
 help.markup sorting classes vocabs.loader ;
diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor
index 4ad9067457..d49262e7c8 100755
--- a/basis/help/lint/lint.factor
+++ b/basis/help/lint/lint.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: fry accessors sequences parser kernel help help.markup
-help.topics words strings classes tools.vocabs namespaces io
-io.streams.string prettyprint definitions arrays vectors
+help.topics words strings classes tools.vocabs namespaces make
+io io.streams.string prettyprint definitions arrays vectors
 combinators combinators.short-circuit splitting debugger
 hashtables sorting effects vocabs vocabs.loader assocs editors
 continuations classes.predicate macros math sets eval ;
@@ -39,7 +39,7 @@ IN: help.lint
         $predicate
         $class-description
         $error-description
-    } swap '[ , elements empty? not ] contains? ;
+    } swap '[ _ elements empty? not ] contains? ;
 
 : check-values ( word element -- )
     {
@@ -110,7 +110,7 @@ M: help-error error.
     H{ } clone [
         '[
             dup >link where dup
-            [ first , at , push-at ] [ 2drop ] if
+            [ first _ at _ push-at ] [ 2drop ] if
         ] each
     ] keep ;
 
diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index 3077a93ed4..b5e074b598 100755
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays definitions generic io kernel assocs
-hashtables namespaces parser prettyprint sequences strings
+hashtables namespaces make parser prettyprint sequences strings
 io.styles vectors words math sorting splitting classes slots
 vocabs help.stylesheet help.topics vocabs.loader alias ;
 IN: help.markup
diff --git a/basis/help/topics/topics.factor b/basis/help/topics/topics.factor
index cdb32b18ee..e6b19d5baa 100755
--- a/basis/help/topics/topics.factor
+++ b/basis/help/topics/topics.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.x
 USING: accessors arrays definitions generic assocs
-io kernel namespaces prettyprint prettyprint.sections
+io kernel namespaces make prettyprint prettyprint.sections
 sequences words summary classes strings vocabs ;
 IN: help.topics
 
diff --git a/basis/hints/hints.factor b/basis/hints/hints.factor
index da6ab96959..1138ad872a 100644
--- a/basis/hints/hints.factor
+++ b/basis/hints/hints.factor
@@ -21,7 +21,7 @@ IN: hints
 : specializer-cases ( quot word -- default alist )
     dup [ array? ] all? [ 1array ] unless [
         [ make-specializer ] keep
-        '[ , declare ] pick append
+        '[ _ declare ] pick append
     ] { } map>assoc ;
 
 : method-declaration ( method -- quot )
@@ -30,7 +30,7 @@ IN: hints
     bi prefix ;
 
 : specialize-method ( quot method -- quot' )
-    method-declaration '[ , declare ] prepend ;
+    method-declaration '[ _ declare ] prepend ;
 
 : specialize-quot ( quot specializer -- quot' )
     specializer-cases alist>quot ;
@@ -91,7 +91,7 @@ IN: hints
 
 \ >string { sbuf } "specializer" set-word-prop
 
-\ >array { { string } { vector } } "specializer" set-word-prop
+\ >array { { vector } } "specializer" set-word-prop
 
 \ >vector { { array } { vector } } "specializer" set-word-prop
 
@@ -101,7 +101,7 @@ IN: hints
 
 \ memq? { array } "specializer" set-word-prop
 
-\ member? { fixnum string } "specializer" set-word-prop
+\ member? { array } "specializer" set-word-prop
 
 \ assoc-stack { vector } "specializer" set-word-prop
 
diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index 0969dd7ef3..6965cb582a 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -88,7 +88,7 @@ TUPLE: choice size multiple choices ;
     </option> ;
 
 : render-options ( options selected -- )
-    '[ dup , member? render-option ] each ;
+    '[ dup _ member? render-option ] each ;
 
 M: choice render*
     <select
diff --git a/basis/html/elements/elements.factor b/basis/html/elements/elements.factor
index 89f8b01a19..ab9d987b67 100644
--- a/basis/html/elements/elements.factor
+++ b/basis/html/elements/elements.factor
@@ -70,7 +70,7 @@ SYMBOL: html
 : def-for-html-word-<foo> ( name -- )
     #! Return the name and code for the <foo> patterned
     #! word.
-    dup <foo> swap '[ , <foo> write-html ]
+    dup <foo> swap '[ _ <foo> write-html ]
     (( -- )) html-word ;
 
 : <foo ( str -- <str ) "<" prepend ;
@@ -78,7 +78,7 @@ SYMBOL: html
 : def-for-html-word-<foo ( name -- )
     #! Return the name and code for the <foo patterned
     #! word.
-    <foo dup '[ , write-html ]
+    <foo dup '[ _ write-html ]
     (( -- )) html-word ;
 
 : foo> ( str -- foo> ) ">" append ;
@@ -93,14 +93,14 @@ SYMBOL: html
 : def-for-html-word-</foo> ( name -- )
     #! Return the name and code for the </foo> patterned
     #! word.
-    </foo> dup '[ , write-html ] (( -- )) html-word ;
+    </foo> dup '[ _ write-html ] (( -- )) html-word ;
 
 : <foo/> ( str -- <str/> ) "<" swap "/>" 3append ;
 
 : def-for-html-word-<foo/> ( name -- )
     #! Return the name and code for the <foo/> patterned
     #! word.
-    dup <foo/> swap '[ , <foo/> write-html ]
+    dup <foo/> swap '[ _ <foo/> write-html ]
     (( -- )) html-word ;
 
 : foo/> ( str -- str/> ) "/>" append ;
@@ -134,7 +134,7 @@ SYMBOL: html
 
 : define-attribute-word ( name -- )
     dup "=" prepend swap
-    '[ , write-attr ] (( string -- )) html-word ;
+    '[ _ write-attr ] (( string -- )) html-word ;
 
 ! Define some closed HTML tags
 [
diff --git a/basis/html/forms/forms.factor b/basis/html/forms/forms.factor
index 911e545f87..7dd4b6146b 100644
--- a/basis/html/forms/forms.factor
+++ b/basis/html/forms/forms.factor
@@ -63,7 +63,7 @@ SYMBOL: nested-forms
 
 : with-form ( name quot -- )
     '[
-        ,
+        _
         [ nested-forms [ swap prefix ] change ]
         [ value form set ]
         bi
@@ -103,4 +103,4 @@ C: <validation-error> validation-error
     swap set-value ;
 
 : validate-values ( assoc validators -- assoc' )
-    swap '[ dup , at _ validate-value ] assoc-each ;
+    swap '[ [ dup _ at ] dip validate-value ] assoc-each ;
diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor
index 6a15b76bd3..7d90296fcb 100755
--- a/basis/html/streams/streams.factor
+++ b/basis/html/streams/streams.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-
-USING: combinators generic assocs help http io io.styles io.files
-       continuations io.streams.string kernel math math.order math.parser
-       namespaces quotations assocs sequences strings words html.elements
-       xml.entities sbufs continuations destructors accessors arrays ;
-
+USING: combinators generic assocs help http io io.styles
+io.files continuations io.streams.string kernel math math.order
+math.parser namespaces make quotations assocs sequences strings
+words html.elements xml.entities sbufs continuations destructors
+accessors arrays ;
 IN: html.streams
 
 GENERIC: browser-link-href ( presented -- href )
diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor
index 45e59c3b6d..5fe53fc7a5 100644
--- a/basis/html/templates/chloe/chloe.factor
+++ b/basis/html/templates/chloe/chloe.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel sequences combinators kernel fry
-namespaces classes.tuple assocs splitting words arrays memoize
-io io.files io.encodings.utf8 io.streams.string unicode.case
-mirrors math urls present multiline quotations xml xml.data
+namespaces make classes.tuple assocs splitting words arrays
+memoize io io.files io.encodings.utf8 io.streams.string
+unicode.case mirrors math urls present multiline quotations xml
+xml.data
 html.forms
 html.elements
 html.components
diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor
index 044d2edb90..f32923f620 100644
--- a/basis/html/templates/chloe/compiler/compiler.factor
+++ b/basis/html/templates/chloe/compiler/compiler.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs namespaces kernel sequences accessors combinators
-strings splitting io io.streams.string present xml.writer
-xml.data xml.entities html.forms html.templates.chloe.syntax ;
+USING: assocs namespaces make kernel sequences accessors
+combinators strings splitting io io.streams.string present
+xml.writer xml.data xml.entities html.forms
+html.templates.chloe.syntax ;
 IN: html.templates.chloe.compiler
 
 : chloe-attrs-only ( assoc -- assoc' )
diff --git a/basis/html/templates/chloe/components/components.factor b/basis/html/templates/chloe/components/components.factor
index e8703a1235..77d7c937be 100644
--- a/basis/html/templates/chloe/components/components.factor
+++ b/basis/html/templates/chloe/components/components.factor
@@ -14,13 +14,13 @@ IN: html.templates.chloe.components
 
 : CHLOE-SINGLETON:
     scan-word
-    [ name>> ] [ '[ , singleton-component-tag ] ] bi
+    [ name>> ] [ '[ _ singleton-component-tag ] ] bi
     define-chloe-tag ;
     parsing
 
 : compile-component-attrs ( tag class -- )
     [ attrs>> [ drop main>> "name" = not ] assoc-filter ] dip
-    [ all-slots swap '[ name>> , at compile-attr ] each ]
+    [ all-slots swap '[ name>> _ at compile-attr ] each ]
     [ [ boa ] [code-with] ]
     bi ;
 
@@ -30,6 +30,6 @@ IN: html.templates.chloe.components
 
 : CHLOE-TUPLE:
     scan-word
-    [ name>> ] [ '[ , tuple-component-tag ] ] bi
+    [ name>> ] [ '[ _ tuple-component-tag ] ] bi
     define-chloe-tag ;
     parsing
diff --git a/basis/html/templates/fhtml/fhtml.factor b/basis/html/templates/fhtml/fhtml.factor
index e435fdce5f..7742ff9bc6 100755
--- a/basis/html/templates/fhtml/fhtml.factor
+++ b/basis/html/templates/fhtml/fhtml.factor
@@ -74,6 +74,6 @@ TUPLE: fhtml path ;
 C: <fhtml> fhtml
 
 M: fhtml call-template* ( filename -- )
-    '[ , path>> utf8 file-contents eval-template ] assert-depth ;
+    '[ _ path>> utf8 file-contents eval-template ] assert-depth ;
 
 INSTANCE: fhtml template
diff --git a/basis/http/client/client.factor b/basis/http/client/client.factor
index 8dc1924a12..5e22f5144d 100755
--- a/basis/http/client/client.factor
+++ b/basis/http/client/client.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs kernel math math.parser namespaces
+USING: accessors assocs kernel math math.parser namespaces make
 sequences io io.sockets io.streams.string io.files io.timeouts
 strings splitting calendar continuations accessors vectors
 math.order hashtables byte-arrays prettyprint
@@ -95,7 +95,7 @@ DEFER: (http-request)
 SYMBOL: redirects
 
 : redirect-url ( request url -- request )
-    '[ , >url derive-url ensure-port ] change-url ;
+    '[ _ >url derive-url ensure-port ] change-url ;
 
 : do-redirect ( response data -- response data )
     over code>> 300 399 between? [
@@ -169,7 +169,7 @@ M: download-failed error.
 : download-to ( url file -- )
     #! Downloads the contents of a URL to a file.
     swap http-get
-    [ content-charset>> ] [ '[ , write ] ] bi*
+    [ content-charset>> ] [ '[ _ write ] ] bi*
     with-file-writer ;
 
 : download ( url -- )
diff --git a/basis/http/http.factor b/basis/http/http.factor
index 03cca05ff3..0cc228c73b 100755
--- a/basis/http/http.factor
+++ b/basis/http/http.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel combinators math namespaces
+USING: accessors kernel combinators math namespaces make
 assocs sequences splitting sorting sets debugger
 strings vectors hashtables quotations arrays byte-arrays
 math.parser calendar calendar.format present
@@ -28,7 +28,7 @@ IN: http
     [ read-crlf dup f like ] [ parse-header-line ] [ drop ] produce ;
 
 : collect-headers ( assoc -- assoc' )
-    H{ } clone [ '[ , push-at ] assoc-each ] keep ;
+    H{ } clone [ '[ _ push-at ] assoc-each ] keep ;
 
 : process-header ( alist -- assoc )
     f swap [ [ swap or dup ] dip swap ] assoc-map nip
@@ -196,7 +196,7 @@ M: response clone
         [ clone ] change-cookies ;
 
 : get-cookie ( request/response name -- cookie/f )
-    [ cookies>> ] dip '[ , _ name>> = ] find nip ;
+    [ cookies>> ] dip '[ [ _ ] dip name>> = ] find nip ;
 
 : delete-cookie ( request/response name -- )
     over cookies>> [ get-cookie ] dip delete ;
diff --git a/basis/http/parsers/parsers.factor b/basis/http/parsers/parsers.factor
index 2a31373951..8e8e7358d1 100644
--- a/basis/http/parsers/parsers.factor
+++ b/basis/http/parsers/parsers.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.short-circuit math math.order math.parser kernel
-sequences sequences.deep peg peg.parsers assocs arrays
-hashtables strings unicode.case namespaces ascii ;
+USING: combinators.short-circuit math math.order math.parser
+kernel sequences sequences.deep peg peg.parsers assocs arrays
+hashtables strings unicode.case namespaces make ascii ;
 IN: http.parsers
 
 : except ( quot -- parser )
diff --git a/basis/http/server/cgi/cgi.factor b/basis/http/server/cgi/cgi.factor
index 354ebd8f70..0a3cb5cff3 100755
--- a/basis/http/server/cgi/cgi.factor
+++ b/basis/http/server/cgi/cgi.factor
@@ -50,7 +50,7 @@ IN: http.server.cgi
     200 >>code
     "CGI output follows" >>message
     swap '[
-        , output-stream get swap <cgi-process> <process-stream> [
+        _ output-stream get swap <cgi-process> <process-stream> [
             post-request? [ request get post-data>> raw>> write flush ] when
             input-stream get swap (stream-copy)
         ] with-stream
diff --git a/basis/http/server/server.factor b/basis/http/server/server.factor
index 436d626578..bad1eb4831 100755
--- a/basis/http/server/server.factor
+++ b/basis/http/server/server.factor
@@ -158,7 +158,7 @@ main-responder global [ <404> <trivial-responder> or ] change-at
 
 : <500> ( error -- response )
     500 "Internal server error" <trivial-response>
-    swap development? get [ '[ , http-error. ] >>body ] [ drop ] if ;
+    swap development? get [ '[ _ http-error. ] >>body ] [ drop ] if ;
 
 : do-response ( response -- )
     [ request get swap write-full-response ]
@@ -198,7 +198,7 @@ LOG: httpd-header NOTICE
     [
         local-address get
         [ secure? "https" "http" ? >>protocol ]
-        [ port>> '[ , or ] change-port ]
+        [ port>> '[ _ or ] change-port ]
         bi
     ] change-url drop ;
 
@@ -207,7 +207,7 @@ LOG: httpd-header NOTICE
 
 : do-request ( request -- response )
     '[
-        ,
+        _
         {
             [ init-request ]
             [ prepare-request ]
diff --git a/basis/http/server/static/static.factor b/basis/http/server/static/static.factor
index dfbe93d86d..b484e64368 100755
--- a/basis/http/server/static/static.factor
+++ b/basis/http/server/static/static.factor
@@ -73,7 +73,7 @@ TUPLE: file-responder root hook special allow-listings ;
 
 : list-directory ( directory -- response )
     file-responder get allow-listings>> [
-        '[ , directory. ] "text/html" <content>
+        '[ _ directory. ] "text/html" <content>
     ] [
         drop <403>
     ] if ;
diff --git a/basis/interval-maps/interval-maps.factor b/basis/interval-maps/interval-maps.factor
index a62855d78f..99da00ceab 100755
--- a/basis/interval-maps/interval-maps.factor
+++ b/basis/interval-maps/interval-maps.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel sequences arrays accessors grouping math.order
-sorting binary-search math assocs locals namespaces ;
+sorting binary-search math assocs locals namespaces make ;
 IN: interval-maps
 
 TUPLE: interval-map array ;
diff --git a/basis/io/servers/connection/connection.factor b/basis/io/servers/connection/connection.factor
index f789f7b114..7d72659f6d 100755
--- a/basis/io/servers/connection/connection.factor
+++ b/basis/io/servers/connection/connection.factor
@@ -67,7 +67,7 @@ M: threaded-server handle-client* handler>> call ;
 
 : handle-client ( client remote local -- )
     '[
-        , , log-connection
+        _ _ log-connection
         threaded-server get
         [ timeout>> timeouts ] [ handle-client* ] bi
     ] with-stream ;
@@ -77,7 +77,7 @@ M: threaded-server handle-client* handler>> call ;
 
 : accept-connection ( threaded-server -- )
     [ accept ] [ addr>> ] bi
-    [ '[ , , , handle-client ] ]
+    [ '[ _ _ _ handle-client ] ]
     [ drop threaded-server get name>> swap thread-name ] 2bi
     spawn drop ;
 
diff --git a/basis/io/servers/packet/datagram.factor b/basis/io/servers/packet/datagram.factor
index 03596ee43c..c081dfb0fa 100644
--- a/basis/io/servers/packet/datagram.factor
+++ b/basis/io/servers/packet/datagram.factor
@@ -18,4 +18,4 @@ LOG: received-datagram NOTICE
 PRIVATE>
 
 : with-datagrams ( seq service quot -- )
-    '[ [ , _ spawn-datagrams ] parallel-each ] with-logging ; inline
+    '[ [ [ _ ] dip spawn-datagrams ] parallel-each ] with-logging ; inline
diff --git a/basis/io/unix/backend/backend.factor b/basis/io/unix/backend/backend.factor
index aa27b21d98..0e9139f431 100755
--- a/basis/io/unix/backend/backend.factor
+++ b/basis/io/unix/backend/backend.factor
@@ -3,7 +3,7 @@
 USING: alien alien.c-types generic assocs kernel kernel.private
 math io.ports sequences strings structs sbufs threads unix
 vectors io.buffers io.backend io.encodings math.parser
-continuations system libc qualified namespaces io.timeouts
+continuations system libc qualified namespaces make io.timeouts
 io.encodings.utf8 destructors accessors summary combinators
 locals ;
 QUALIFIED: io
diff --git a/basis/io/unix/linux/monitors/monitors.factor b/basis/io/unix/linux/monitors/monitors.factor
index ff23fba0c6..12b1cf779b 100644
--- a/basis/io/unix/linux/monitors/monitors.factor
+++ b/basis/io/unix/linux/monitors/monitors.factor
@@ -3,8 +3,8 @@
 USING: kernel io.backend io.monitors io.monitors.recursive
 io.files io.buffers io.monitors io.ports io.timeouts
 io.unix.backend io.unix.select io.encodings.utf8
-unix.linux.inotify assocs namespaces threads continuations init
-math math.bitwise sets alien alien.strings alien.c-types
+unix.linux.inotify assocs namespaces make threads continuations
+init math math.bitwise sets alien alien.strings alien.c-types
 vocabs.loader accessors system hashtables destructors unix ;
 IN: io.unix.linux.monitors
 
diff --git a/basis/io/unix/unix-tests.factor b/basis/io/unix/unix-tests.factor
index 3147d7144b..7e1dc48e5f 100755
--- a/basis/io/unix/unix-tests.factor
+++ b/basis/io/unix/unix-tests.factor
@@ -1,7 +1,7 @@
 USING: io.files io.sockets io kernel threads
 namespaces tools.test continuations strings byte-arrays
 sequences prettyprint system io.encodings.binary io.encodings.ascii
-io.streams.duplex destructors ;
+io.streams.duplex destructors make ;
 IN: io.unix.tests
 
 ! Unix domain stream sockets
diff --git a/basis/io/windows/files/files.factor b/basis/io/windows/files/files.factor
index 5698ab6cf2..40e7e17402 100755
--- a/basis/io/windows/files/files.factor
+++ b/basis/io/windows/files/files.factor
@@ -3,7 +3,7 @@
 USING: alien.c-types io.binary io.backend io.files io.buffers
 io.windows kernel math splitting
 windows windows.kernel32 windows.time calendar combinators
-math.functions sequences namespaces words symbols system
+math.functions sequences namespaces make words symbols system
 io.ports destructors accessors math.bitwise ;
 IN: io.windows.files
 
diff --git a/basis/io/windows/launcher/launcher.factor b/basis/io/windows/launcher/launcher.factor
index eabd044bb4..d1ad309dd5 100755
--- a/basis/io/windows/launcher/launcher.factor
+++ b/basis/io/windows/launcher/launcher.factor
@@ -3,7 +3,7 @@
 USING: alien alien.c-types arrays continuations io
 io.windows io.windows.nt.pipes libc io.ports
 windows.types math windows.kernel32
-namespaces io.launcher kernel sequences windows.errors
+namespaces make io.launcher kernel sequences windows.errors
 splitting system threads init strings combinators
 io.backend accessors concurrency.flags io.files assocs
 io.files.private windows destructors ;
diff --git a/basis/io/windows/nt/files/files.factor b/basis/io/windows/nt/files/files.factor
index 5fbacfa325..b572d9ec65 100755
--- a/basis/io/windows/nt/files/files.factor
+++ b/basis/io/windows/nt/files/files.factor
@@ -4,7 +4,7 @@ io.windows.nt.backend windows windows.kernel32
 kernel libc math threads system
 alien.c-types alien.arrays alien.strings sequences combinators
 combinators.short-circuit ascii splitting alien strings
-assocs namespaces io.files.private accessors tr ;
+assocs namespaces make io.files.private accessors tr ;
 IN: io.windows.nt.files
 
 M: winnt cwd
diff --git a/basis/io/windows/nt/launcher/launcher.factor b/basis/io/windows/nt/launcher/launcher.factor
index ff11c456ca..9d02fbe2fd 100755
--- a/basis/io/windows/nt/launcher/launcher.factor
+++ b/basis/io/windows/nt/launcher/launcher.factor
@@ -1,12 +1,11 @@
 ! Copyright (C) 2007, 2008 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types arrays continuations destructors io
-io.windows libc io.ports io.pipes windows.types
-math windows.kernel32 windows namespaces io.launcher kernel
+io.windows libc io.ports io.pipes windows.types math
+windows.kernel32 windows namespaces make io.launcher kernel
 sequences windows.errors assocs splitting system strings
-io.windows.launcher io.windows.files
-io.backend io.files io.files.private combinators shuffle
-accessors locals ;
+io.windows.launcher io.windows.files io.backend io.files
+io.files.private combinators shuffle accessors locals ;
 IN: io.windows.nt.launcher
 
 : duplicate-handle ( handle -- handle' )
diff --git a/basis/io/windows/nt/monitors/monitors.factor b/basis/io/windows/nt/monitors/monitors.factor
index 54cb3b1104..2680b40089 100755
--- a/basis/io/windows/nt/monitors/monitors.factor
+++ b/basis/io/windows/nt/monitors/monitors.factor
@@ -1,12 +1,11 @@
 ! Copyright (C) 2008 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types libc destructors locals
-kernel math assocs namespaces continuations sequences hashtables
-sorting arrays combinators math.bitwise strings system
-accessors threads splitting
-io.backend io.windows io.windows.nt.backend io.windows.nt.files
-io.monitors io.ports io.buffers io.files io.timeouts io
-windows windows.kernel32 windows.types ;
+USING: alien alien.c-types libc destructors locals kernel math
+assocs namespaces make continuations sequences hashtables
+sorting arrays combinators math.bitwise strings system accessors
+threads splitting io.backend io.windows io.windows.nt.backend
+io.windows.nt.files io.monitors io.ports io.buffers io.files
+io.timeouts io windows windows.kernel32 windows.types ;
 IN: io.windows.nt.monitors
 
 : open-directory ( path -- handle )
diff --git a/basis/io/windows/nt/pipes/pipes.factor b/basis/io/windows/nt/pipes/pipes.factor
index aa52152b75..c9bf1ebf42 100755
--- a/basis/io/windows/nt/pipes/pipes.factor
+++ b/basis/io/windows/nt/pipes/pipes.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types arrays destructors io io.windows libc
 windows.types math.bitwise windows.kernel32 windows namespaces
-kernel sequences windows.errors assocs math.parser system random
-combinators accessors io.pipes io.ports ;
+make kernel sequences windows.errors assocs math.parser system
+random combinators accessors io.pipes io.ports ;
 IN: io.windows.nt.pipes
 
 ! This code is based on
diff --git a/basis/json/reader/reader.factor b/basis/json/reader/reader.factor
index e21b1292e3..dd1ab8d5d8 100755
--- a/basis/json/reader/reader.factor
+++ b/basis/json/reader/reader.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel parser-combinators namespaces sequences promises strings 
+USING: kernel parser-combinators namespaces make sequences promises strings 
        assocs math math.parser math.vectors math.functions math.order
        lists hashtables ascii accessors ;
 IN: json.reader
diff --git a/basis/json/writer/writer.factor b/basis/json/writer/writer.factor
index 0d22494b13..cbcf426545 100644
--- a/basis/json/writer/writer.factor
+++ b/basis/json/writer/writer.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2006 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel io.streams.string io strings splitting sequences math 
-       math.parser assocs classes words namespaces prettyprint
-       hashtables mirrors tr ;
+USING: kernel io.streams.string io strings splitting sequences
+math math.parser assocs classes words namespaces make
+prettyprint hashtables mirrors tr ;
 IN: json.writer
 
 #! Writes the object out to a stream in JSON format
diff --git a/basis/lcs/lcs.factor b/basis/lcs/lcs.factor
index 6f9ae3c883..759e923a34 100755
--- a/basis/lcs/lcs.factor
+++ b/basis/lcs/lcs.factor
@@ -1,5 +1,6 @@
 USING: sequences kernel math locals math.order math.ranges
-accessors arrays namespaces combinators combinators.short-circuit ;
+accessors arrays namespaces make combinators
+combinators.short-circuit ;
 IN: lcs
 
 <PRIVATE
diff --git a/basis/locals/locals.factor b/basis/locals/locals.factor
index af5f6834bc..bfc92ee9e2 100755
--- a/basis/locals/locals.factor
+++ b/basis/locals/locals.factor
@@ -1,14 +1,13 @@
 ! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces sequences sequences.private assocs math
-       vectors strings classes.tuple generalizations 
-       parser words quotations debugger macros arrays macros splitting
-       combinators prettyprint.backend definitions prettyprint
-       hashtables prettyprint.sections sets sequences.private effects
-       effects.parser generic generic.parser compiler.units accessors
-       locals.backend memoize macros.expander lexer
-       stack-checker.known-words ;
-
+USING: kernel namespaces make sequences sequences.private assocs
+math vectors strings classes.tuple generalizations parser words
+quotations debugger macros arrays macros splitting combinators
+prettyprint.backend definitions prettyprint hashtables
+prettyprint.sections sets sequences.private effects
+effects.parser generic generic.parser compiler.units accessors
+locals.backend memoize macros.expander lexer
+stack-checker.known-words ;
 IN: locals
 
 ! Inspired by
diff --git a/basis/logging/insomniac/insomniac.factor b/basis/logging/insomniac/insomniac.factor
index 79d9410994..7c1db5b7c0 100755
--- a/basis/logging/insomniac/insomniac.factor
+++ b/basis/logging/insomniac/insomniac.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: logging.analysis logging.server logging smtp kernel
-io.files io.streams.string namespaces alarms assocs
+io.files io.streams.string namespaces make alarms assocs
 io.encodings.utf8 accessors calendar sequences qualified ;
 QUALIFIED: io.sockets
 IN: logging.insomniac
diff --git a/basis/logging/logging.factor b/basis/logging/logging.factor
index aa4e46fad1..ae9ef877dd 100755
--- a/basis/logging/logging.factor
+++ b/basis/logging/logging.factor
@@ -76,7 +76,7 @@ PRIVATE>
 : input# ( word -- n ) stack-effect in>> length ;
 
 : input-logging-quot ( quot word level -- quot' )
-    rot [ [ input# ] keep ] 2dip '[ , , , log-stack @ ] ;
+    rot [ [ input# ] keep ] 2dip '[ _ _ _ log-stack @ ] ;
 
 : add-input-logging ( word level -- )
     [ input-logging-quot ] (define-logging) ;
@@ -84,7 +84,7 @@ PRIVATE>
 : output# ( word -- n ) stack-effect out>> length ;
 
 : output-logging-quot ( quot word level -- quot' )
-    [ [ output# ] keep ] dip '[ @ , , , log-stack ] ;
+    [ [ output# ] keep ] dip '[ @ _ _ _ log-stack ] ;
 
 : add-output-logging ( word level -- )
     [ output-logging-quot ] (define-logging) ;
@@ -107,7 +107,7 @@ PRIVATE>
 
 : error-logging-quot ( quot word -- quot' )
     dup stack-effect stack-balancer
-    '[ , [ , log-error @ ] recover ] ;
+    '[ _ [ _ log-error @ ] recover ] ;
 
 : add-error-logging ( word level -- )
     [ [ input-logging-quot ] 2keep drop error-logging-quot ]
@@ -116,7 +116,7 @@ PRIVATE>
 : LOG:
     #! Syntax: name level
     CREATE-WORD dup scan-word
-    '[ 1array stack>message , , log-message ]
+    '[ 1array stack>message _ _ log-message ]
     (( message -- )) define-declared ; parsing
 
 USE: vocabs.loader
diff --git a/basis/logging/parser/parser.factor b/basis/logging/parser/parser.factor
index 2448243201..07a84ec5c6 100755
--- a/basis/logging/parser/parser.factor
+++ b/basis/logging/parser/parser.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors peg peg.parsers memoize kernel sequences
-logging arrays words strings vectors io io.files io.encodings.utf8
-namespaces combinators logging.server calendar calendar.format ;
+logging arrays words strings vectors io io.files
+io.encodings.utf8 namespaces make combinators logging.server
+calendar calendar.format ;
 IN: logging.parser
 
 TUPLE: log-entry date level word-name message ;
diff --git a/basis/macros/expander/expander.factor b/basis/macros/expander/expander.factor
index 0a1703de58..d766430810 100644
--- a/basis/macros/expander/expander.factor
+++ b/basis/macros/expander/expander.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences namespaces quotations accessors words
-continuations vectors effects math stack-checker.transforms ;
+USING: kernel sequences namespaces make quotations accessors
+words continuations vectors effects math
+stack-checker.transforms ;
 IN: macros.expander
 
 GENERIC: expand-macros ( quot -- quot' )
diff --git a/basis/match/match.factor b/basis/match/match.factor
index 0ae285d20d..c546555d07 100755
--- a/basis/match/match.factor
+++ b/basis/match/match.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 ! Based on pattern matching code from Paul Graham's book 'On Lisp'.
-USING: parser lexer kernel words namespaces sequences classes.tuple
-combinators macros assocs math effects ;
+USING: parser lexer kernel words namespaces make sequences
+classes.tuple combinators macros assocs math effects ;
 IN: match
 
 SYMBOL: _
diff --git a/basis/math/bitwise/bitwise.factor b/basis/math/bitwise/bitwise.factor
index 60c585c779..871f40e74c 100644
--- a/basis/math/bitwise/bitwise.factor
+++ b/basis/math/bitwise/bitwise.factor
@@ -69,7 +69,7 @@ DEFER: byte-bit-count
 \ byte-bit-count
 256 [
     0 swap [ [ 1+ ] when ] each-bit
-] B{ } map-as '[ HEX: ff bitand , nth-unsafe ] define-inline
+] B{ } map-as '[ HEX: ff bitand _ nth-unsafe ] define-inline
 
 >>
 
diff --git a/basis/math/functions/functions-docs.factor b/basis/math/functions/functions-docs.factor
index bbfd8f41be..f9bb8e9897 100755
--- a/basis/math/functions/functions-docs.factor
+++ b/basis/math/functions/functions-docs.factor
@@ -282,8 +282,8 @@ HELP: each-bit
 { $values { "n" integer } { "quot" "a quotation with stack effect " { $snippet "( ? -- )" } } }
 { $description "Applies the quotation to each bit of the integer, starting from the least significant bit, and stopping at the last bit from which point on all bits are either clear (if the integer is positive) or all bits are set (if the integer is negataive)." }
 { $examples
-    { $example "USING: math.functions namespaces prettyprint ;" "[ BIN: 1101 [ , ] each-bit ] { } make ." "{ t f t t }" }
-    { $example "USING: math.functions namespaces prettyprint ;" "[ -3 [ , ] each-bit ] { } make ." "{ t f }" }
+    { $example "USING: math.functions make prettyprint ;" "[ BIN: 1101 [ , ] each-bit ] { } make ." "{ t f t t }" }
+    { $example "USING: math.functions make prettyprint ;" "[ -3 [ , ] each-bit ] { } make ." "{ t f }" }
 } ;
 
 HELP: ~
diff --git a/basis/math/partial-dispatch/partial-dispatch.factor b/basis/math/partial-dispatch/partial-dispatch.factor
index baa5558f7f..b162406e5a 100644
--- a/basis/math/partial-dispatch/partial-dispatch.factor
+++ b/basis/math/partial-dispatch/partial-dispatch.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel kernel.private math math.private words
-sequences parser namespaces assocs quotations arrays locals
-generic generic.math hashtables effects compiler.units ;
+sequences parser namespaces make assocs quotations arrays locals
+generic generic.math hashtables effects compiler.units
+classes.algebra ;
 IN: math.partial-dispatch
 
 ! Partial dispatch.
@@ -96,19 +97,28 @@ SYMBOL: fast-math-ops
     [ drop math-class-max swap specific-method >boolean ] if ;
 
 : (derived-ops) ( word assoc -- words )
-    swap [ rot first eq? nip ] curry assoc-filter values ;
+    swap [ rot first eq? nip ] curry assoc-filter ;
 
 : derived-ops ( word -- words )
-    [ 1array ]
-    [ math-ops get (derived-ops) ]
-    bi append ;
+    [ 1array ] [ math-ops get (derived-ops) values ] bi append ;
 
 : fast-derived-ops ( word -- words )
-    fast-math-ops get (derived-ops) ;
+    fast-math-ops get (derived-ops) values ;
 
 : all-derived-ops ( word -- words )
     [ derived-ops ] [ fast-derived-ops ] bi append ;
 
+: integer-derived-ops ( word -- words )
+    [ math-ops get (derived-ops) ] [ fast-math-ops get (derived-ops) ] bi
+    [
+            [
+            drop
+            [ second integer class<= ]
+            [ third integer class<= ]
+            bi and
+        ] assoc-filter values
+    ] bi@ append ;
+
 : each-derived-op ( word quot -- )
     >r derived-ops r> each ; inline
 
diff --git a/basis/memoize/memoize.factor b/basis/memoize/memoize.factor
index 4b1a4a67d5..1c31156311 100755
--- a/basis/memoize/memoize.factor
+++ b/basis/memoize/memoize.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel hashtables sequences arrays words namespaces
+USING: kernel hashtables sequences arrays words namespaces make
 parser math assocs effects definitions quotations summary
 accessors ;
 IN: memoize
diff --git a/basis/mime-types/mime-types.factor b/basis/mime-types/mime-types.factor
index 9489da8149..909f762c50 100755
--- a/basis/mime-types/mime-types.factor
+++ b/basis/mime-types/mime-types.factor
@@ -16,7 +16,9 @@ MEMO: mime-db ( -- seq )
     } ;
 
 MEMO: mime-types ( -- assoc )
-    [ mime-db [ unclip '[ , _ set ] each ] each ] H{ } make-assoc
+    [
+        mime-db [ unclip '[ [ _ ] dip set ] each ] each
+    ] H{ } make-assoc
     nonstandard-mime-types assoc-union ;
 
 : mime-type ( filename -- mime-type )
diff --git a/basis/multiline/multiline.factor b/basis/multiline/multiline.factor
index 856b9ad456..5969fc0a95 100755
--- a/basis/multiline/multiline.factor
+++ b/basis/multiline/multiline.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces parser lexer kernel sequences words quotations math
-accessors ;
+USING: namespaces make parser lexer kernel sequences words
+quotations math accessors ;
 IN: multiline
 
 <PRIVATE
diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor
index 7083262c49..776450ccd9 100644
--- a/basis/peg/ebnf/ebnf.factor
+++ b/basis/peg/ebnf/ebnf.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel compiler.units words arrays strings math.parser sequences 
-       quotations vectors namespaces math assocs continuations peg
-       peg.parsers unicode.categories multiline 
-       splitting accessors effects sequences.deep peg.search
-       combinators.short-circuit lexer io.streams.string
-       stack-checker io prettyprint combinators parser ;
+USING: kernel compiler.units words arrays strings math.parser
+sequences quotations vectors namespaces make math assocs
+continuations peg peg.parsers unicode.categories multiline
+splitting accessors effects sequences.deep peg.search
+combinators.short-circuit lexer io.streams.string stack-checker
+io prettyprint combinators parser ;
 IN: peg.ebnf
 
 : rule ( name word -- parser )
diff --git a/basis/peg/parsers/parsers.factor b/basis/peg/parsers/parsers.factor
index 93de40d672..5739482093 100755
--- a/basis/peg/parsers/parsers.factor
+++ b/basis/peg/parsers/parsers.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2007, 2008 Chris Double, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences strings namespaces math assocs shuffle 
-     vectors arrays math.parser accessors
-     unicode.categories sequences.deep peg peg.private 
-     peg.search math.ranges words ;
+USING: kernel sequences strings namespaces make math assocs
+shuffle vectors arrays math.parser accessors unicode.categories
+sequences.deep peg peg.private peg.search math.ranges words ;
 IN: peg.parsers
 
 TUPLE: just-parser p1 ;
diff --git a/basis/peg/peg-tests.factor b/basis/peg/peg-tests.factor
index 11001ca411..2d7e2a81ac 100644
--- a/basis/peg/peg-tests.factor
+++ b/basis/peg/peg-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 !
-USING: kernel tools.test strings namespaces arrays sequences 
+USING: kernel tools.test strings namespaces make arrays sequences 
        peg peg.private accessors words math accessors ;
 IN: peg.tests
 
diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index 9ef1ac658e..cc13d5d425 100755
--- a/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2007, 2008 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences strings fry namespaces math assocs shuffle debugger io
-       vectors arrays math.parser math.order vectors combinators
-       classes sets unicode.categories compiler.units parser
-       words quotations effects memoize accessors locals effects splitting 
-       combinators.short-circuit combinators.short-circuit.smart
-       generalizations ;
+USING: kernel sequences strings fry namespaces make math assocs
+shuffle debugger io vectors arrays math.parser math.order
+vectors combinators classes sets unicode.categories
+compiler.units parser words quotations effects memoize accessors
+locals effects splitting combinators.short-circuit
+combinators.short-circuit.smart generalizations ;
 IN: peg
 
 USE: prettyprint
@@ -356,7 +356,7 @@ TUPLE: token-parser symbol ;
   ] if ;
 
 M: token-parser (compile) ( peg -- quot )
-  symbol>> '[ input-slice , parse-token ] ;
+  symbol>> '[ input-slice _ parse-token ] ;
    
 TUPLE: satisfy-parser quot ;
 
@@ -373,7 +373,7 @@ TUPLE: satisfy-parser quot ;
 
 
 M: satisfy-parser (compile) ( peg -- quot )
-  quot>> '[ input-slice , parse-satisfy ] ;
+  quot>> '[ input-slice _ parse-satisfy ] ;
 
 TUPLE: range-parser min max ;
 
@@ -389,7 +389,7 @@ TUPLE: range-parser min max ;
   ] if ;
 
 M: range-parser (compile) ( peg -- quot )
-  [ min>> ] [ max>> ] bi '[ input-slice , , parse-range ] ;
+  [ min>> ] [ max>> ] bi '[ input-slice _ _ parse-range ] ;
 
 TUPLE: seq-parser parsers ;
 
@@ -447,7 +447,7 @@ TUPLE: repeat0-parser p1 ;
 
 M: repeat0-parser (compile) ( peg -- quot )
   p1>> compile-parser 1quotation '[ 
-    input-slice V{ } clone <parse-result> , swap (repeat) 
+    input-slice V{ } clone <parse-result> _ swap (repeat) 
   ] ; 
 
 TUPLE: repeat1-parser p1 ;
@@ -461,7 +461,7 @@ TUPLE: repeat1-parser p1 ;
 
 M: repeat1-parser (compile) ( peg -- quot )
   p1>> compile-parser 1quotation '[ 
-    input-slice V{ } clone <parse-result> , swap (repeat) repeat1-empty-check  
+    input-slice V{ } clone <parse-result> _ swap (repeat) repeat1-empty-check  
   ] ; 
 
 TUPLE: optional-parser p1 ;
@@ -483,7 +483,7 @@ TUPLE: semantic-parser p1 quot ;
 
 M: semantic-parser (compile) ( peg -- quot )
   [ p1>> compile-parser 1quotation ] [ quot>> ] bi  
-  '[ @ , check-semantic ] ;
+  '[ @ _ check-semantic ] ;
 
 TUPLE: ensure-parser p1 ;
 
@@ -511,7 +511,7 @@ TUPLE: action-parser p1 quot ;
   ] if ; inline
 
 M: action-parser (compile) ( peg -- quot )
-  [ p1>> compile-parser 1quotation ] [ quot>> ] bi '[ @ , check-action ] ;
+  [ p1>> compile-parser 1quotation ] [ quot>> ] bi '[ @ _ check-action ] ;
 
 TUPLE: sp-parser p1 ;
 
diff --git a/basis/persistent/hashtables/hashtables-tests.factor b/basis/persistent/hashtables/hashtables-tests.factor
index ac6aa240cc..5ed72e5d59 100644
--- a/basis/persistent/hashtables/hashtables-tests.factor
+++ b/basis/persistent/hashtables/hashtables-tests.factor
@@ -85,7 +85,7 @@ M: hash-0-b hashcode* 2drop 0 ;
 
 : random-assocs ( -- hash phash )
     [ random-string ] replicate
-    [ H{ } clone [ '[ swap , set-at ] each-index ] keep ]
+    [ H{ } clone [ '[ swap _ set-at ] each-index ] keep ]
     [ PH{ } clone swap [ spin new-at ] each-index ]
     bi ;
 
diff --git a/basis/persistent/hashtables/hashtables.factor b/basis/persistent/hashtables/hashtables.factor
index 2e2be264bb..a867dbb2e3 100644
--- a/basis/persistent/hashtables/hashtables.factor
+++ b/basis/persistent/hashtables/hashtables.factor
@@ -1,7 +1,7 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
 USING: kernel math accessors assocs fry combinators parser
-prettyprint.backend namespaces
+prettyprint.backend make
 persistent.assocs
 persistent.hashtables.nodes
 persistent.hashtables.nodes.empty
diff --git a/basis/persistent/hashtables/nodes/collision/collision.factor b/basis/persistent/hashtables/nodes/collision/collision.factor
index 83003e5c47..2ee4008f2b 100644
--- a/basis/persistent/hashtables/nodes/collision/collision.factor
+++ b/basis/persistent/hashtables/nodes/collision/collision.factor
@@ -8,7 +8,7 @@ persistent.hashtables.nodes.leaf ;
 IN: persistent.hashtables.nodes.collision
 
 : find-index ( key hashcode collision-node -- n leaf-node )
-    leaves>> -rot '[ , , _ matching-key? ] find ; inline
+    leaves>> -rot '[ [ _ _ ] dip matching-key? ] find ; inline
 
 M:: collision-node (entry-at) ( key hashcode collision-node -- leaf-node )
     key hashcode collision-node find-index nip ;
diff --git a/basis/persistent/hashtables/nodes/leaf/leaf.factor b/basis/persistent/hashtables/nodes/leaf/leaf.factor
index 7fa4cfe401..3419e8387f 100644
--- a/basis/persistent/hashtables/nodes/leaf/leaf.factor
+++ b/basis/persistent/hashtables/nodes/leaf/leaf.factor
@@ -1,6 +1,6 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
-USING: kernel accessors locals math arrays namespaces
+USING: kernel accessors locals math arrays namespaces make
 persistent.hashtables.config
 persistent.hashtables.nodes ;
 IN: persistent.hashtables.nodes.leaf
diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor
index c2fd94e5cf..f8445c7783 100755
--- a/basis/prettyprint/backend/backend.factor
+++ b/basis/prettyprint/backend/backend.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays byte-arrays byte-vectors generic
-hashtables io assocs kernel math namespaces sequences strings
-sbufs io.styles vectors words prettyprint.config
+hashtables io assocs kernel math namespaces make sequences
+strings sbufs io.styles vectors words prettyprint.config
 prettyprint.sections quotations io io.files math.parser effects
 classes.tuple math.order classes.tuple.private classes
 combinators colors ;
diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor
index 9bffb34ed1..6a4ac71eb8 100755
--- a/basis/prettyprint/prettyprint-tests.factor
+++ b/basis/prettyprint/prettyprint-tests.factor
@@ -3,7 +3,7 @@ kernel math namespaces parser prettyprint prettyprint.config
 prettyprint.sections sequences tools.test vectors words
 effects splitting generic.standard prettyprint.private
 continuations generic compiler.units tools.walker eval
-accessors ;
+accessors make ;
 IN: prettyprint.tests
 
 [ "4" ] [ 4 unparse ] unit-test
@@ -181,7 +181,7 @@ DEFER: parse-error-file
 
 : another-soft-break-test
     {
-        "USING: namespaces sequences ;"
+        "USING: make sequences ;"
         "IN: prettyprint.tests"
         ": another-soft-break-layout ( node -- quot )"
         "    parse-error-file"
diff --git a/basis/prettyprint/prettyprint.factor b/basis/prettyprint/prettyprint.factor
index 3b9d034378..149ecde447 100755
--- a/basis/prettyprint/prettyprint.factor
+++ b/basis/prettyprint/prettyprint.factor
@@ -1,15 +1,13 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-
-USING: arrays generic generic.standard assocs io kernel
-math namespaces sequences strings io.styles io.streams.string
+USING: arrays generic generic.standard assocs io kernel math
+namespaces make sequences strings io.styles io.streams.string
 vectors words prettyprint.backend prettyprint.sections
 prettyprint.config sorting splitting grouping math.parser vocabs
 definitions effects classes.builtin classes.tuple io.files
 classes continuations hashtables classes.mixin classes.union
 classes.intersection classes.predicate classes.singleton
 combinators quotations sets accessors colors ;
-
 IN: prettyprint
 
 : make-pprint ( obj quot -- block in use )
diff --git a/basis/prettyprint/sections/sections.factor b/basis/prettyprint/sections/sections.factor
index 13c86ea994..a629ca6fff 100644
--- a/basis/prettyprint/sections/sections.factor
+++ b/basis/prettyprint/sections/sections.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays generic hashtables io kernel math assocs
-namespaces sequences strings io.styles vectors words
+namespaces make sequences strings io.styles vectors words
 prettyprint.config splitting classes continuations
 io.streams.nested accessors sets ;
 IN: prettyprint.sections
diff --git a/basis/random/mersenne-twister/mersenne-twister-docs.factor.bak b/basis/random/mersenne-twister/mersenne-twister-docs.factor.bak
deleted file mode 100644
index 981b206b29..0000000000
--- a/basis/random/mersenne-twister/mersenne-twister-docs.factor.bak
+++ /dev/null
@@ -1,31 +0,0 @@
-USING: help.markup help.syntax math ;
-IN: random.mersenne-twister
-
-ARTICLE: "random-numbers" "Generating random integers"
-"The " { $vocab-link "random" } " vocabulary implements the ``Mersenne Twister'' pseudo-random number generator algorithm."
-! { $subsection init-random }
-{ $subsection (random) }
-{ $subsection random } ;
-
-ABOUT: "random-numbers"
-
-! HELP: init-random
-! { $values { "seed" integer } }
-! { $description "Initializes the random number generator with the given seed. This word is called on startup to initialize the random number generator with the current time." } ;
-
-HELP: (random)
-{ $values { "rand" "an integer between 0 and 2^32-1" } }
-{ $description "Generates a random 32-bit unsigned integer." } ;
-
-HELP: random
-{ $values { "seq" "a sequence" } { "elt" "a random element" } }
-{ $description "Outputs a random element of the sequence. If the sequence is empty, always outputs " { $link f } "." }
-{ $notes "Since integers are sequences, passing an integer " { $snippet "n" } " yields a random integer in the interval " { $snippet "[0,n)" } "." } ;
-
-HELP: big-random
-{ $values { "n" "an integer" } { "r" "a random integer" } }
-{ $description "Outputs an integer with n bytes worth of bits." } ;
-
-HELP: random-256
-{ $values { "r" "a random integer" } }
-{ $description "Outputs an random integer 256 bits in length." } ;
diff --git a/basis/random/mersenne-twister/mersenne-twister-tests.factor b/basis/random/mersenne-twister/mersenne-twister-tests.factor
index d25ceacdb1..3f0ebf692a 100755
--- a/basis/random/mersenne-twister/mersenne-twister-tests.factor
+++ b/basis/random/mersenne-twister/mersenne-twister-tests.factor
@@ -1,5 +1,5 @@
-USING: kernel math random namespaces random.mersenne-twister
-sequences tools.test math.order ;
+USING: kernel math random namespaces make
+random.mersenne-twister sequences tools.test math.order ;
 IN: random.mersenne-twister.tests
 
 : check-random ( max -- ? )
diff --git a/basis/random/random.factor b/basis/random/random.factor
index 0a421288d5..5ee45e6729 100755
--- a/basis/random/random.factor
+++ b/basis/random/random.factor
@@ -14,7 +14,7 @@ GENERIC: random-32* ( tuple -- r )
 GENERIC: random-bytes* ( n tuple -- byte-array )
 
 M: object random-bytes* ( n tuple -- byte-array )
-    swap [ drop random-32* ] with map >c-uint-array ;
+    [ random-32* ] curry replicate [ 4 >le ] map concat ;
 
 M: object random-32* ( tuple -- r ) 4 random-bytes* le> ;
 
@@ -36,9 +36,9 @@ M: f random-32* ( obj -- * ) no-random-number-generator ;
 : random ( seq -- elt )
     [ f ] [
         [
-            length dup log2 7 + 8 /i 1+ random-bytes
-            [ length 3 shift 2^ ] [ byte-array>bignum ] bi
-            swap / * >integer
+            length dup log2 7 + 8 /i 1+
+            [ random-bytes byte-array>bignum ]
+            [ 3 shift 2^ ] bi / * >integer
         ] keep nth
     ] if-empty ;
 
diff --git a/basis/sequences/deep/deep-tests.factor b/basis/sequences/deep/deep-tests.factor
index 395086e202..a88634aa8a 100755
--- a/basis/sequences/deep/deep-tests.factor
+++ b/basis/sequences/deep/deep-tests.factor
@@ -1,5 +1,5 @@
 USING: sequences.deep kernel tools.test strings math arrays
-namespaces sequences ;
+namespaces make sequences ;
 IN: sequences.deep.tests
 
 [ [ "hello" 3 4 swap ] ] [ [ { "hello" V{ 3 4 } } swap ] flatten ] unit-test
diff --git a/basis/smtp/smtp.factor b/basis/smtp/smtp.factor
index fa98c7a947..f95ecddc1e 100755
--- a/basis/smtp/smtp.factor
+++ b/basis/smtp/smtp.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Elie CHAFTARI, Dirk Vleugels,
 ! Slava Pestov, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays namespaces io io.timeouts kernel logging
+USING: arrays namespaces make io io.timeouts kernel logging
 io.sockets sequences combinators splitting assocs strings
 math.parser random system calendar io.encodings.ascii summary
 calendar.format accessors sets hashtables ;
diff --git a/basis/stack-checker/backend/backend.factor b/basis/stack-checker/backend/backend.factor
index f4cd2c4a8e..aa280b96b6 100755
--- a/basis/stack-checker/backend/backend.factor
+++ b/basis/stack-checker/backend/backend.factor
@@ -70,7 +70,7 @@ M: object apply-object push-literal ;
     2array recursive-state get swap prefix infer-quot ;
 
 : time-bomb ( error -- )
-    '[ , throw ] recursive-state get infer-quot ;
+    '[ _ throw ] recursive-state get infer-quot ;
 
 : bad-call ( -- )
     "call must be given a callable" time-bomb ;
@@ -165,7 +165,7 @@ M: object apply-object push-literal ;
     ] maybe-cannot-infer ;
 
 : apply-word/effect ( word effect -- )
-    swap '[ , #call, ] consume/produce ;
+    swap '[ _ #call, ] consume/produce ;
 
 : required-stack-effect ( word -- effect )
     dup stack-effect [ ] [ \ missing-effect inference-error ] ?if ;
diff --git a/basis/stack-checker/branches/branches.factor b/basis/stack-checker/branches/branches.factor
index 4685483103..511dcc6bbd 100644
--- a/basis/stack-checker/branches/branches.factor
+++ b/basis/stack-checker/branches/branches.factor
@@ -17,12 +17,12 @@ SYMBOL: +bottom+
 : pad-with-bottom ( seq -- newseq )
     dup empty? [
         dup [ length ] map supremum
-        '[ , +bottom+ pad-left ] map
+        '[ _ +bottom+ pad-left ] map
     ] unless ;
 
 : phi-inputs ( max-d-in pairs -- newseq )
     dup empty? [ nip ] [
-        swap '[ , _ first2 unify-inputs ] map
+        swap '[ [ _ ] dip first2 unify-inputs ] map
         pad-with-bottom
     ] if ;
 
@@ -50,7 +50,7 @@ SYMBOL: quotations
     ] if-empty ;
 
 : branch-variable ( seq symbol -- seq )
-    '[ , _ at ] map ;
+    '[ [ _ ] dip at ] map ;
 
 : active-variable ( seq symbol -- seq )
     [ [ terminated? over at [ drop f ] when ] map ] dip
diff --git a/basis/stack-checker/inlining/inlining.factor b/basis/stack-checker/inlining/inlining.factor
index 07ff016b2d..7847fdfdcf 100644
--- a/basis/stack-checker/inlining/inlining.factor
+++ b/basis/stack-checker/inlining/inlining.factor
@@ -130,13 +130,13 @@ SYMBOL: enter-out
 : adjust-stack-effect ( effect -- effect' )
     [ in>> ] [ out>> ] bi
     meta-d get length pick length [-]
-    object <repetition> '[ , prepend ] bi@
+    object <repetition> '[ _ prepend ] bi@
     <effect> ;
 
 : call-recursive-inline-word ( word -- )
     dup "recursive" word-prop [
         [ required-stack-effect adjust-stack-effect ] [ ] [ recursive-label ] tri
-        [ 2nip check-call ] [ nip '[ , #call-recursive, ] consume/produce ] 3bi
+        [ 2nip check-call ] [ nip '[ _ #call-recursive, ] consume/produce ] 3bi
     ] [ undeclared-recursion-error inference-error ] if ;
 
 : inline-word ( word -- )
diff --git a/basis/stack-checker/state/state.factor b/basis/stack-checker/state/state.factor
index 0d0de7f19b..d3d32b5014 100755
--- a/basis/stack-checker/state/state.factor
+++ b/basis/stack-checker/state/state.factor
@@ -91,7 +91,7 @@ SYMBOL: dependencies
 : depends-on ( word how -- )
     over primitive? [ 2drop ] [
         dependencies get dup [
-            swap '[ , strongest-dependency ] change-at
+            swap '[ _ strongest-dependency ] change-at
         ] [ 3drop ] if
     ] if ;
 
@@ -100,7 +100,7 @@ SYMBOL: generic-dependencies
 
 : depends-on-generic ( generic class -- )
     generic-dependencies get dup
-    [ swap '[ null or , class-or ] change-at ] [ 3drop ] if ;
+    [ swap '[ null or _ class-or ] change-at ] [ 3drop ] if ;
 
 ! Words we've inferred the stack effect of, for rollback
 SYMBOL: recorded
diff --git a/basis/stack-checker/transforms/transforms.factor b/basis/stack-checker/transforms/transforms.factor
index d60565e849..41c7e2c972 100755
--- a/basis/stack-checker/transforms/transforms.factor
+++ b/basis/stack-checker/transforms/transforms.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: fry accessors arrays kernel words sequences generic math
-namespaces quotations assocs combinators classes.tuple
+namespaces make quotations assocs combinators classes.tuple
 classes.tuple.private effects summary hashtables classes generic
 sets definitions generic.standard slots.private continuations
 stack-checker.backend stack-checker.state stack-checker.visitor
@@ -19,7 +19,7 @@ IN: stack-checker.transforms
     dup [
         [
             [ drop ] [
-                [ length meta-d get '[ , pop* ] times ]
+                [ length meta-d get '[ _ pop* ] times ]
                 [ #drop, ]
                 bi
             ] bi*
@@ -97,7 +97,7 @@ IN: stack-checker.transforms
     dup tuple-class? [
         dup inlined-dependency depends-on
         [ "boa-check" word-prop ]
-        [ tuple-layout '[ , <tuple-boa> ] ]
+        [ tuple-layout '[ _ <tuple-boa> ] ]
         bi append
     ] [ drop f ] if
 ] 1 define-transform
diff --git a/basis/state-parser/state-parser.factor b/basis/state-parser/state-parser.factor
index 15c83bf73a..dab5414b49 100644
--- a/basis/state-parser/state-parser.factor
+++ b/basis/state-parser/state-parser.factor
@@ -100,7 +100,7 @@ SYMBOL: prolog-data
     #! from code until the quotation given is true and
     #! advance spot to after the substring.
     10 <sbuf> [
-        '[ @ [ t ] [ get-char , push f ] if ] skip-until
+        '[ @ [ t ] [ get-char _ push f ] if ] skip-until
     ] keep >string ; inline
 
 : take-rest ( -- string )
@@ -120,7 +120,7 @@ M: not-enough-characters summary ( obj -- str )
 
 : take ( n -- string )
     [ 1- ] [ <sbuf> ] bi [
-        '[ drop get-char [ next , push f ] [ t ] if* ] contains? drop
+        '[ drop get-char [ next _ push f ] [ t ] if* ] contains? drop
     ] keep get-char [ over push ] when* >string ;
 
 : pass-blank ( -- )
diff --git a/basis/summary/summary.factor b/basis/summary/summary.factor
index 5da6599c63..ea2c19fd6d 100644
--- a/basis/summary/summary.factor
+++ b/basis/summary/summary.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors classes sequences splitting kernel namespaces
-words math math.parser io.styles prettyprint assocs ;
+make words math math.parser io.styles prettyprint assocs ;
 IN: summary
 
 GENERIC: summary ( object -- string )
diff --git a/basis/syndication/syndication.factor b/basis/syndication/syndication.factor
index 2fa8abcd59..a432d8c31c 100644
--- a/basis/syndication/syndication.factor
+++ b/basis/syndication/syndication.factor
@@ -4,7 +4,7 @@
 USING: xml.utilities kernel assocs xml.generator math.order
     strings sequences xml.data xml.writer
     io.streams.string combinators xml xml.entities io.files io
-    http.client namespaces xml.generator hashtables
+    http.client namespaces make xml.generator hashtables
     calendar.format accessors continuations urls present ;
 IN: syndication
 
diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index ae4f6a8d62..324adcaad2 100755
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces continuations.private kernel.private init
+USING: namespaces make continuations.private kernel.private init
 assocs kernel vocabs words sequences memory io system arrays
 continuations math definitions mirrors splitting parser classes
 summary layouts vocabs.loader prettyprint.config prettyprint
-debugger io.streams.c io.files io.backend
-quotations io.launcher words.private tools.deploy.config
-bootstrap.image io.encodings.utf8 destructors accessors ;
+debugger io.streams.c io.files io.backend quotations io.launcher
+words.private tools.deploy.config bootstrap.image
+io.encodings.utf8 destructors accessors ;
 IN: tools.deploy.backend
 
 : copy-vm ( executable bundle-name extension -- vm )
diff --git a/basis/tools/deploy/macosx/macosx.factor b/basis/tools/deploy/macosx/macosx.factor
index d38b40db4b..ee60ce3982 100755
--- a/basis/tools/deploy/macosx/macosx.factor
+++ b/basis/tools/deploy/macosx/macosx.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io io.files kernel namespaces sequences
+USING: io io.files kernel namespaces make sequences
 system tools.deploy.backend tools.deploy.config assocs
 hashtables prettyprint io.unix.backend cocoa io.encodings.utf8
 io.backend cocoa.application cocoa.classes cocoa.plists
diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 7e37436654..f2726c00fa 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors qualified io.streams.c init fry namespaces
+USING: accessors qualified io.streams.c init fry namespaces make
 assocs kernel parser lexer strings.parser tools.deploy.config
 vocabs sequences words words.private memory kernel.private
 continuations io prettyprint vocabs.loader debugger system
@@ -76,7 +76,7 @@ IN: tools.deploy.shaker
     [
         [
             props>> swap
-            '[ drop , member? not ] assoc-filter sift-assoc
+            '[ drop _ member? not ] assoc-filter sift-assoc
             dup assoc-empty? [ drop f ] [ >alist >vector ] if
         ] keep (>>props)
     ] with each ;
@@ -283,7 +283,7 @@ IN: tools.deploy.shaker
     strip-globals? [
         "Stripping globals" show
         global swap
-        '[ drop , member? not ] assoc-filter
+        '[ drop _ member? not ] assoc-filter
         [ drop string? not ] assoc-filter ! strip CLI args
         sift-assoc
         dup keys unparse show
diff --git a/basis/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor
index 6f5a0304a2..5e1d0be7fb 100644
--- a/basis/tools/deploy/unix/unix.factor
+++ b/basis/tools/deploy/unix/unix.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 James Cash
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io io.files io.backend kernel namespaces sequences
+USING: io io.files io.backend kernel namespaces make sequences
 system tools.deploy.backend tools.deploy.config assocs
 hashtables prettyprint ;
 IN: tools.deploy.unix
diff --git a/basis/tools/disassembler/disassembler.factor b/basis/tools/disassembler/disassembler.factor
index 887fd1b6d7..dabdaaaa7c 100755
--- a/basis/tools/disassembler/disassembler.factor
+++ b/basis/tools/disassembler/disassembler.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Slava Pestov, Jorge Acereda Macia.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files io words alien kernel math.parser alien.syntax
-io.launcher system assocs arrays sequences namespaces qualified
-system math compiler.generator.fixup io.encodings.ascii
-accessors generic tr ;
+io.launcher system assocs arrays sequences namespaces make
+qualified system math compiler.generator.fixup
+io.encodings.ascii accessors generic tr ;
 IN: tools.disassembler
 
 : in-file ( -- path ) "gdb-in.txt" temp-file ;
diff --git a/basis/tools/vocabs/vocabs.factor b/basis/tools/vocabs/vocabs.factor
index 1c7e8d28d2..732a6635b7 100755
--- a/basis/tools/vocabs/vocabs.factor
+++ b/basis/tools/vocabs/vocabs.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel io io.styles io.files io.encodings.utf8
-vocabs.loader vocabs sequences namespaces math.parser arrays
-hashtables assocs memoize summary sorting splitting combinators
-source-files debugger continuations compiler.errors init
-checksums checksums.crc32 sets accessors ;
+vocabs.loader vocabs sequences namespaces make math.parser
+arrays hashtables assocs memoize summary sorting splitting
+combinators source-files debugger continuations compiler.errors
+init checksums checksums.crc32 sets accessors ;
 IN: tools.vocabs
 
 : vocab-tests-file ( vocab -- path )
diff --git a/basis/tools/walker/walker.factor b/basis/tools/walker/walker.factor
index c1073eda8c..9775bdff81 100755
--- a/basis/tools/walker/walker.factor
+++ b/basis/tools/walker/walker.factor
@@ -4,7 +4,7 @@ USING: threads kernel namespaces continuations combinators
 sequences math namespaces.private continuations.private
 concurrency.messaging quotations kernel.private words
 sequences.private assocs models models.filter arrays accessors
-generic generic.standard definitions ;
+generic generic.standard definitions make ;
 IN: tools.walker
 
 SYMBOL: show-walker-hook ! ( status continuation thread -- )
diff --git a/basis/tr/tr.factor b/basis/tr/tr.factor
index b5ad2ba430..30d0efb28b 100644
--- a/basis/tr/tr.factor
+++ b/basis/tr/tr.factor
@@ -7,7 +7,7 @@ IN: tr
 <PRIVATE
 
 : compute-tr ( quot from to -- mapping )
-    zip [ 256 ] 2dip '[ [ @ , at ] keep or ] B{ } map-as ; inline
+    zip [ 256 ] 2dip '[ [ @ _ at ] keep or ] B{ } map-as ; inline
 
 : tr-hints ( word -- )
     { { byte-array } { string } } "specializer" set-word-prop ;
@@ -16,13 +16,13 @@ IN: tr
     create-in dup tr-hints ;
 
 : tr-quot ( mapping -- quot )
-    '[ [ dup 0 255 between? [ , nth-unsafe ] when ] map ] ;
+    '[ [ dup 0 255 between? [ _ nth-unsafe ] when ] map ] ;
 
 : define-tr ( word mapping -- )
     tr-quot (( seq -- translated )) define-declared ;
 
 : fast-tr-quot ( mapping -- quot )
-    '[ [ , nth-unsafe ] change-each ] ;
+    '[ [ _ nth-unsafe ] change-each ] ;
 
 : define-fast-tr ( word mapping -- )
     fast-tr-quot (( seq -- )) define-declared ;
diff --git a/basis/ui/commands/commands-docs.factor b/basis/ui/commands/commands-docs.factor
index 804236dadc..25312ad868 100644
--- a/basis/ui/commands/commands-docs.factor
+++ b/basis/ui/commands/commands-docs.factor
@@ -1,5 +1,5 @@
 USING: accessors ui.gestures help.markup help.syntax strings kernel
-hashtables quotations words classes sequences namespaces
+hashtables quotations words classes sequences namespaces make
 arrays assocs ;
 IN: ui.commands
 
diff --git a/basis/ui/commands/commands.factor b/basis/ui/commands/commands.factor
index 2677c496ec..b45e2e4004 100755
--- a/basis/ui/commands/commands.factor
+++ b/basis/ui/commands/commands.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays definitions kernel sequences strings
-math assocs words generic namespaces assocs quotations splitting
-ui.gestures unicode.case unicode.categories tr ;
+math assocs words generic namespaces make assocs quotations
+splitting ui.gestures unicode.case unicode.categories tr ;
 IN: ui.commands
 
 SYMBOL: +nullary+
diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index 8142297318..888716b364 100755
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays documents io kernel math models
-namespaces opengl opengl.gl sequences strings io.styles
+namespaces make opengl opengl.gl sequences strings io.styles
 math.vectors sorting colors combinators assocs math.order
 ui.clipboards ui.commands ui.gadgets ui.gadgets.borders
 ui.gadgets.buttons ui.gadgets.labels ui.gadgets.scrollers
diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor
index 15850ae357..05764d5b84 100755
--- a/basis/ui/gadgets/gadgets.factor
+++ b/basis/ui/gadgets/gadgets.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays hashtables kernel models math namespaces
-       sequences quotations math.vectors combinators sorting
-       binary-search vectors dlists deques models threads
-       concurrency.flags math.order math.geometry.rect ;
-
+make sequences quotations math.vectors combinators sorting
+binary-search vectors dlists deques models threads
+concurrency.flags math.order math.geometry.rect ;
 IN: ui.gadgets
 
 SYMBOL: ui-notify-flag
diff --git a/basis/ui/gadgets/grids/grids.factor b/basis/ui/gadgets/grids/grids.factor
index 42e8cfdfdf..f14ccf1cca 100644
--- a/basis/ui/gadgets/grids/grids.factor
+++ b/basis/ui/gadgets/grids/grids.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel math namespaces sequences words io
+USING: arrays kernel math namespaces make sequences words io
 io.streams.string math.vectors ui.gadgets columns accessors
 math.geometry.rect ;
 IN: ui.gadgets.grids
diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor
index ed951824b8..f27b9898a1 100755
--- a/basis/ui/gadgets/labels/labels.factor
+++ b/basis/ui/gadgets/labels/labels.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays hashtables io kernel math namespaces
-opengl sequences strings splitting
-ui.gadgets ui.gadgets.tracks ui.gadgets.theme ui.render colors
-models ;
+make opengl sequences strings splitting ui.gadgets
+ui.gadgets.tracks ui.gadgets.theme ui.render colors models ;
 IN: ui.gadgets.labels
 
 ! A label gadget draws a string.
diff --git a/basis/ui/gadgets/tracks/tracks.factor b/basis/ui/gadgets/tracks/tracks.factor
index cf679424e0..029bc5447c 100644
--- a/basis/ui/gadgets/tracks/tracks.factor
+++ b/basis/ui/gadgets/tracks/tracks.factor
@@ -9,7 +9,7 @@ IN: ui.gadgets.tracks
 TUPLE: track < pack sizes ;
 
 : normalized-sizes ( track -- seq )
-  sizes>> dup sift sum '[ dup [ , / ] when ] map ;
+  sizes>> dup sift sum '[ dup [ _ / ] when ] map ;
 
 : init-track ( track -- track )
   init-gadget
diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor
index 1170ea3fd1..a1c6adac6e 100755
--- a/basis/ui/gestures/gestures.factor
+++ b/basis/ui/gestures/gestures.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs kernel math models namespaces
-sequences words strings system hashtables math.parser
-math.vectors classes.tuple classes ui.gadgets boxes
-calendar alarms symbols combinators sets columns ;
+make sequences words strings system hashtables math.parser
+math.vectors classes.tuple classes ui.gadgets boxes calendar
+alarms symbols combinators sets columns ;
 IN: ui.gestures
 
 : set-gestures ( class hash -- ) "gestures" set-word-prop ;
diff --git a/basis/ui/operations/operations.factor b/basis/ui/operations/operations.factor
index 8b4817dcac..3e0b36486e 100755
--- a/basis/ui/operations/operations.factor
+++ b/basis/ui/operations/operations.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays definitions kernel ui.commands
-ui.gestures sequences strings math words generic namespaces
+ui.gestures sequences strings math words generic namespaces make
 hashtables help.markup quotations assocs ;
 IN: ui.operations
 
diff --git a/basis/ui/tools/walker/walker.factor b/basis/ui/tools/walker/walker.factor
index 51091c576d..7bc42ea676 100755
--- a/basis/ui/tools/walker/walker.factor
+++ b/basis/ui/tools/walker/walker.factor
@@ -4,7 +4,7 @@ USING: accessors kernel concurrency.messaging inspector
 ui.tools.listener ui.tools.traceback ui.gadgets.buttons
 ui.gadgets.status-bar ui.gadgets.tracks ui.commands ui.gadgets
 models models.filter ui.tools.workspace ui.gestures
-ui.gadgets.labels ui threads namespaces tools.walker assocs
+ui.gadgets.labels ui threads namespaces make tools.walker assocs
 combinators ;
 IN: ui.tools.walker
 
diff --git a/basis/ui/traverse/traverse-tests.factor b/basis/ui/traverse/traverse-tests.factor
index 8486aaff21..e18637a652 100755
--- a/basis/ui/traverse/traverse-tests.factor
+++ b/basis/ui/traverse/traverse-tests.factor
@@ -1,6 +1,6 @@
-USING: accessors ui.gadgets ui.gadgets.labels namespaces sequences kernel
-math arrays tools.test io ui.gadgets.panes ui.traverse
-definitions compiler.units ;
+USING: accessors ui.gadgets ui.gadgets.labels namespaces make
+sequences kernel math arrays tools.test io ui.gadgets.panes
+ui.traverse definitions compiler.units ;
 IN: ui.traverse.tests
 
 M: array children>> ;
diff --git a/basis/ui/traverse/traverse.factor b/basis/ui/traverse/traverse.factor
index 440f6487c2..eadd110fe7 100644
--- a/basis/ui/traverse/traverse.factor
+++ b/basis/ui/traverse/traverse.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors namespaces sequences kernel math arrays io ui.gadgets
-generic combinators ;
+USING: accessors namespaces make sequences kernel math arrays io
+ui.gadgets generic combinators ;
 IN: ui.traverse
 
 TUPLE: node value children ;
diff --git a/basis/ui/ui-docs.factor b/basis/ui/ui-docs.factor
index e086b7ebae..d8c816d717 100755
--- a/basis/ui/ui-docs.factor
+++ b/basis/ui/ui-docs.factor
@@ -192,7 +192,6 @@ HELP: raise-window
 ARTICLE: "ui-layouts" "Gadget hierarchy and layouts"
 "A layout gadget is a gadget whose sole purpose is to contain other gadgets. Layout gadgets position and resize children according to a certain policy, taking the preferred size of the children into account. Gadget hierarchies are constructed by building up nested layouts."
 { $subsection "ui-layout-basics" }
-{ $subsection "ui-layout-combinators" }
 "Common layout gadgets:"
 { $subsection "ui-pack-layout" }
 { $subsection "ui-track-layout" }
@@ -230,12 +229,6 @@ $nl
 { $subsection pref-dim* }
 "To get a gadget's preferred size, do not call the above word, instead use " { $link pref-dim  } ",  which caches the result." ;
 
-ARTICLE: "ui-layout-combinators" "Creating layouts using combinators"
-"The " { $link make } " combinator provides a convenient way of constructing sequences by keeping the intermediate sequence off the stack until construction is done. The " { $link , } " and " { $link % } " words operate on this implicit sequence, reducing stack noise."
-$nl
-"Similar tools exist for constructing complex gadget hierarchies. Different words are used for different types of gadgets; see " { $link "ui-pack-layout" } ", " { $link "ui-track-layout" } " and " { $link "ui-frame-layout" } " for specifics. This section documents their common factors."
-;
-
 ARTICLE: "ui-null-layout" "Manual layouts"
 "When automatic layout is not appropriate, gadgets can be added to a parent with no layout policy, and then positioned and sized manually by setting the " { $snippet "loc" } " field." ;
 
diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 22abfc8f21..da9e2f0d43 100755
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays assocs io kernel math models namespaces
+USING: arrays assocs io kernel math models namespaces make
 prettyprint dlists deques sequences threads sequences words
 debugger ui.gadgets ui.gadgets.worlds ui.gadgets.tracks
 ui.gestures ui.backend ui.render continuations init combinators
diff --git a/basis/ui/windows/windows.factor b/basis/ui/windows/windows.factor
index f6481225ae..345c73bcb9 100755
--- a/basis/ui/windows/windows.factor
+++ b/basis/ui/windows/windows.factor
@@ -3,7 +3,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.strings arrays assocs ui
 ui.gadgets ui.backend ui.clipboards ui.gadgets.worlds
-ui.gestures io kernel math math.vectors namespaces
+ui.gestures io kernel math math.vectors namespaces make
 sequences strings vectors words windows.kernel32 windows.gdi32
 windows.user32 windows.opengl32 windows.messages windows.types
 windows.nt windows threads libc combinators continuations
diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor
index e4018e4d20..88381ca7d7 100755
--- a/basis/unicode/breaks/breaks.factor
+++ b/basis/unicode/breaks/breaks.factor
@@ -1,7 +1,8 @@
-USING: combinators.short-circuit unicode.categories kernel math combinators splitting
-sequences math.parser io.files io assocs arrays namespaces
-math.ranges unicode.normalize values io.encodings.ascii
-unicode.syntax unicode.data compiler.units alien.syntax sets ;
+USING: combinators.short-circuit unicode.categories kernel math
+combinators splitting sequences math.parser io.files io assocs
+arrays namespaces make math.ranges unicode.normalize values
+io.encodings.ascii unicode.syntax unicode.data compiler.units
+alien.syntax sets ;
 IN: unicode.breaks
 
 C-ENUM: Any L V T Extend Control CR LF graphemes ;
diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor
index 0234a959da..5e961e2d67 100755
--- a/basis/unicode/case/case.factor
+++ b/basis/unicode/case/case.factor
@@ -1,4 +1,4 @@
-USING: unicode.data sequences sequences.next namespaces
+USING: unicode.data sequences sequences.next namespaces make
 unicode.normalize math unicode.categories combinators
 assocs strings splitting kernel accessors ;
 IN: unicode.case
diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor
index d71fffaaab..3ebb474a81 100755
--- a/basis/unicode/collation/collation.factor
+++ b/basis/unicode/collation/collation.factor
@@ -1,6 +1,6 @@
 USING: combinators.short-circuit sequences io.files
 io.encodings.ascii kernel values splitting accessors math.parser
-ascii io assocs strings math namespaces sorting combinators
+ascii io assocs strings math namespaces make sorting combinators
 math.order arrays unicode.normalize unicode.data locals
 unicode.syntax macros sequences.deep words unicode.breaks
 quotations ;
diff --git a/basis/unicode/normalize/normalize.factor b/basis/unicode/normalize/normalize.factor
index 6f36461d38..53a38faed4 100755
--- a/basis/unicode/normalize/normalize.factor
+++ b/basis/unicode/normalize/normalize.factor
@@ -1,4 +1,4 @@
-USING: sequences namespaces unicode.data kernel math arrays
+USING: sequences namespaces make unicode.data kernel math arrays
 locals sorting.insertion accessors ;
 IN: unicode.normalize
 
diff --git a/basis/unicode/script/script.factor b/basis/unicode/script/script.factor
index 40b0751e2c..aa9ca843bd 100755
--- a/basis/unicode/script/script.factor
+++ b/basis/unicode/script/script.factor
@@ -1,6 +1,6 @@
 USING: accessors values kernel sequences assocs io.files
 io.encodings ascii math.ranges io splitting math.parser 
-namespaces byte-arrays locals math sets io.encodings.ascii
+namespaces make byte-arrays locals math sets io.encodings.ascii
 words compiler.units arrays interval-maps unicode.data ;
 IN: unicode.script
 
diff --git a/basis/unicode/syntax/syntax.factor b/basis/unicode/syntax/syntax.factor
index 9df14a3928..1ba76fd380 100755
--- a/basis/unicode/syntax/syntax.factor
+++ b/basis/unicode/syntax/syntax.factor
@@ -1,6 +1,6 @@
-USING: unicode.data kernel math sequences parser lexer bit-arrays
-namespaces sequences.private arrays quotations assocs
-classes.predicate math.order eval ;
+USING: unicode.data kernel math sequences parser lexer
+bit-arrays namespaces make sequences.private arrays quotations
+assocs classes.predicate math.order eval ;
 IN: unicode.syntax
 
 ! Character classes (categories)
diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor
index 299f305371..e16f62d1f1 100644
--- a/basis/urls/urls.factor
+++ b/basis/urls/urls.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel ascii combinators combinators.short-circuit
-sequences splitting fry namespaces assocs arrays strings
+sequences splitting fry namespaces make assocs arrays strings
 io.sockets io.sockets.secure io.encodings.string
 io.encodings.utf8 math math.parser accessors parser
 strings.parser lexer prettyprint.backend hashtables present ;
@@ -105,7 +105,7 @@ TUPLE: url protocol username password host port path query anchor ;
     swap query>> at ;
 
 : set-query-param ( url value key -- url )
-    '[ , , _ ?set-at ] change-query ;
+    '[ [ _ _ ] dip ?set-at ] change-query ;
 
 : parse-host ( string -- host port )
     ":" split1 [ url-decode ] [
@@ -220,7 +220,7 @@ PRIVATE>
     } case ;
 
 : ensure-port ( url -- url' )
-    dup protocol>> '[ , protocol-port or ] change-port ;
+    dup protocol>> '[ _ protocol-port or ] change-port ;
 
 ! Literal syntax
 : URL" lexer get skip-blank parse-string >url parsed ; parsing
diff --git a/basis/validators/validators.factor b/basis/validators/validators.factor
index b786ef5529..f24171b2b4 100644
--- a/basis/validators/validators.factor
+++ b/basis/validators/validators.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2006, 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel continuations sequences math
-namespaces sets math.parser math.ranges assocs regexp
-unicode.categories arrays hashtables words
-classes quotations xmode.catalog ;
+USING: kernel continuations sequences math namespaces make sets
+math.parser math.ranges assocs regexp unicode.categories arrays
+hashtables words classes quotations xmode.catalog ;
 IN: validators
 
 : v-default ( str def -- str )
diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor
index 2f766a3a51..c56293babe 100755
--- a/basis/windows/com/syntax/syntax.factor
+++ b/basis/windows/com/syntax/syntax.factor
@@ -12,7 +12,7 @@ C-STRUCT: com-interface
 MACRO: com-invoke ( n return parameters -- )
     dup length -roll
     '[
-        , npick com-interface-vtbl , swap void*-nth , ,
+        _ npick com-interface-vtbl _ swap void*-nth _ _
         "stdcall" alien-indirect
     ] ;
 
diff --git a/basis/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor
index 59b616ecc7..d376cccae2 100755
--- a/basis/windows/com/wrapper/wrapper.factor
+++ b/basis/windows/com/wrapper/wrapper.factor
@@ -48,7 +48,7 @@ unless
     (query-interface-cases) 
     '[
         swap 16 memory>byte-array
-        , case
+        _ case
         [
             "void*" heap-size * rot <displaced-alien> com-add-ref
             0 rot set-void*-nth S_OK
@@ -57,14 +57,14 @@ unless
 
 : (make-add-ref) ( interfaces -- quot )
     length "void*" heap-size * '[
-        , swap <displaced-alien>
+        _ swap <displaced-alien>
         0 over ulong-nth
         1+ [ 0 rot set-ulong-nth ] keep
     ] ;
 
 : (make-release) ( interfaces -- quot )
     length "void*" heap-size * '[
-        , over <displaced-alien>
+        _ over <displaced-alien>
         0 over ulong-nth
         1- [ 0 rot set-ulong-nth ] keep
         dup zero? [ swap (free-wrapped-object) ] [ nip ] if
@@ -79,16 +79,16 @@ unless
 : (thunk) ( n -- quot )
     dup 0 =
     [ drop [ ] ]
-    [ "void*" heap-size neg * '[ , swap <displaced-alien> ] ]
+    [ "void*" heap-size neg * '[ _ swap <displaced-alien> ] ]
     if ;
 
 : (thunked-quots) ( quots iunknown-methods thunk -- {thunk,quot}s )
-    [ '[ , '[ @ com-unwrap ] [ swap 2array ] curry map ] ]
-    [ '[ ,                   [ swap 2array ] curry map ] ] bi bi*
+    [ '[ _ '[ @ com-unwrap ] [ swap 2array ] curry map ] ]
+    [ '[ _                   [ swap 2array ] curry map ] ] bi bi*
     swap append ;
 
 : compile-alien-callback ( word return parameters abi quot -- word )
-    '[ , , , , alien-callback ]
+    '[ _ _ _ _ alien-callback ]
     [ [ (( -- alien )) define-declared ] pick slip ]
     with-compilation-unit ;
 
@@ -100,7 +100,7 @@ unless
     "windows.com.wrapper.callbacks" create ;
 
 : (finish-thunk) ( param-count thunk quot -- thunked-quot )
-    [ [ drop [ ] ] [ swap 1- '[ , , ndip ] ] if-empty ]
+    [ [ drop [ ] ] [ swap 1- '[ _ _ ndip ] ] if-empty ]
     dip compose ;
 
 : (make-interface-callbacks) ( interface-name quots iunknown-methods n -- words )
@@ -108,7 +108,7 @@ unless
     swap [ find-com-interface-definition family-tree-functions ]
     keep (next-vtbl-counter) '[
         swap [
-            [ name>> , , (callback-word) ]
+            [ name>> _ _ (callback-word) ]
             [ return>> ] [
                 parameters>>
                 [ [ first ] map ]
diff --git a/basis/windows/dinput/constants/constants.factor b/basis/windows/dinput/constants/constants.factor
index 6c55ff0e67..182c17430f 100755
--- a/basis/windows/dinput/constants/constants.factor
+++ b/basis/windows/dinput/constants/constants.factor
@@ -78,7 +78,7 @@ SYMBOLS:
 
 : (malloc-guid-symbol) ( symbol guid -- )
     global swap '[ [
-        , execute [ byte-length malloc ] [ over byte-array>memory ] bi
+        _ execute [ byte-length malloc ] [ over byte-array>memory ] bi
     ] unless* ] change-at ;
 
 : define-guid-constants ( -- )
diff --git a/basis/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor
index 21b07f9a7d..6256211266 100755
--- a/basis/windows/ole32/ole32.factor
+++ b/basis/windows/ole32/ole32.factor
@@ -1,6 +1,7 @@
 USING: alien alien.syntax alien.c-types alien.strings math
 kernel sequences windows windows.types debugger io accessors
-math.order namespaces math.parser windows.kernel32 combinators ;
+math.order namespaces make math.parser windows.kernel32
+combinators ;
 IN: windows.ole32
 
 LIBRARY: ole32
diff --git a/basis/wrap/wrap.factor b/basis/wrap/wrap.factor
index 29a8bbf10f..87a870d75d 100644
--- a/basis/wrap/wrap.factor
+++ b/basis/wrap/wrap.factor
@@ -1,4 +1,4 @@
-USING: sequences kernel namespaces splitting math math.order ;
+USING: sequences kernel namespaces make splitting math math.order ;
 IN: wrap
 
 ! Very stupid word wrapping/line breaking
diff --git a/basis/x11/glx/glx.factor b/basis/x11/glx/glx.factor
index a8608235f2..eefb93772a 100644
--- a/basis/x11/glx/glx.factor
+++ b/basis/x11/glx/glx.factor
@@ -3,7 +3,7 @@
 !
 ! based on glx.h from xfree86, and some of glxtokens.h
 USING: alien alien.c-types alien.syntax alien.syntax.private x11.xlib
-namespaces kernel sequences parser words ;
+namespaces make kernel sequences parser words ;
 IN: x11.glx
 
 LIBRARY: glx
diff --git a/basis/xml/entities/entities.factor b/basis/xml/entities/entities.factor
index b90613ec79..d3eca30685 100644
--- a/basis/xml/entities/entities.factor
+++ b/basis/xml/entities/entities.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces kernel assocs sequences ;
+USING: namespaces make kernel assocs sequences ;
 IN: xml.entities
 
 : entities-out
diff --git a/basis/xml/generator/generator.factor b/basis/xml/generator/generator.factor
index 0de1692e00..24da501265 100644
--- a/basis/xml/generator/generator.factor
+++ b/basis/xml/generator/generator.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2006, 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces kernel xml.data xml.utilities assocs sequences ;
+USING: namespaces make kernel xml.data xml.utilities assocs
+sequences ;
 IN: xml.generator
 
 : comment, ( string -- ) <comment> , ;
diff --git a/basis/xml/tests/test.factor b/basis/xml/tests/test.factor
index f2bd5ce1e3..623663ebe1 100644
--- a/basis/xml/tests/test.factor
+++ b/basis/xml/tests/test.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 IN: xml.tests
-USING: kernel xml tools.test io namespaces sequences xml.errors xml.entities
-    parser strings xml.data io.files xml.writer xml.utilities state-parser 
-    continuations assocs sequences.deep accessors ;
+USING: kernel xml tools.test io namespaces make sequences
+xml.errors xml.entities parser strings xml.data io.files
+xml.writer xml.utilities state-parser continuations assocs
+sequences.deep accessors ;
 
 ! This is insufficient
 \ read-xml must-infer
diff --git a/basis/xml/tokenize/tokenize.factor b/basis/xml/tokenize/tokenize.factor
index 0c3ef2c1df..b7314c5b25 100644
--- a/basis/xml/tokenize/tokenize.factor
+++ b/basis/xml/tokenize/tokenize.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml.errors xml.data xml.utilities xml.char-classes sets
-xml.entities kernel state-parser kernel namespaces strings math
-math.parser sequences assocs arrays splitting combinators unicode.case
-accessors ;
+xml.entities kernel state-parser kernel namespaces make strings
+math math.parser sequences assocs arrays splitting combinators
+unicode.case accessors ;
 IN: xml.tokenize
 
 ! XML namespace processing: ns = namespace
diff --git a/basis/xmode/code2html/responder/responder.factor b/basis/xmode/code2html/responder/responder.factor
index 2bc766dbc6..9115b1389b 100755
--- a/basis/xmode/code2html/responder/responder.factor
+++ b/basis/xmode/code2html/responder/responder.factor
@@ -9,8 +9,8 @@ IN: xmode.code2html.responder
     [
         drop
         dup '[
-            , utf8 [
-                , file-name input-stream get htmlize-stream
+            _ utf8 [
+                _ file-name input-stream get htmlize-stream
             ] with-file-reader
         ] "text/html" <content>
     ] <file-responder> ;
diff --git a/basis/xmode/loader/syntax/syntax.factor b/basis/xmode/loader/syntax/syntax.factor
index 5512b68b04..69c4e4fac3 100644
--- a/basis/xmode/loader/syntax/syntax.factor
+++ b/basis/xmode/loader/syntax/syntax.factor
@@ -1,6 +1,9 @@
-USING: accessors xmode.tokens xmode.rules xmode.keyword-map xml.data
-xml.utilities xml assocs kernel combinators sequences
-math.parser namespaces parser lexer xmode.utilities regexp io.files ;
+! Copyright (C) 2007, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors xmode.tokens xmode.rules xmode.keyword-map
+xml.data xml.utilities xml assocs kernel combinators sequences
+math.parser namespaces make parser lexer xmode.utilities regexp
+io.files ;
 IN: xmode.loader.syntax
 
 SYMBOL: ignore-case?
diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index dfdd6c801a..d0d68febec 100755
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -1,5 +1,7 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
 IN: xmode.marker
-USING: kernel namespaces xmode.rules xmode.tokens
+USING: kernel namespaces make xmode.rules xmode.tokens
 xmode.marker.state xmode.marker.context xmode.utilities
 xmode.catalog sequences math assocs combinators
 strings regexp splitting parser-combinators ascii unicode.case
diff --git a/basis/xmode/marker/state/state.factor b/basis/xmode/marker/state/state.factor
index 9075ff6329..096230ff4e 100755
--- a/basis/xmode/marker/state/state.factor
+++ b/basis/xmode/marker/state/state.factor
@@ -1,5 +1,7 @@
+! Copyright (C) 2007, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
 USING: xmode.marker.context xmode.rules symbols accessors
-xmode.tokens namespaces kernel sequences assocs math ;
+xmode.tokens namespaces make kernel sequences assocs math ;
 IN: xmode.marker.state
 
 ! Based on org.gjt.sp.jedit.syntax.TokenMarker
diff --git a/core/assocs/assocs-tests.factor b/core/assocs/assocs-tests.factor
index 4a44dbd641..3deb08ac62 100755
--- a/core/assocs/assocs-tests.factor
+++ b/core/assocs/assocs-tests.factor
@@ -1,5 +1,5 @@
 IN: assocs.tests
-USING: kernel math namespaces tools.test vectors sequences
+USING: kernel math namespaces make tools.test vectors sequences
 sequences.private hashtables io prettyprint assocs
 continuations float-arrays ;
 
diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index ad56dbd296..1a6fa3c18a 100755
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien arrays byte-arrays generic hashtables
-hashtables.private io kernel math math.order namespaces parser
-sequences strings vectors words quotations assocs layouts
+hashtables.private io kernel math math.order namespaces make
+parser sequences strings vectors words quotations assocs layouts
 classes classes.builtin classes.tuple classes.tuple.private
 kernel.private vocabs vocabs.loader source-files definitions
 slots classes.union classes.intersection classes.predicate
diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 92558561d2..efa7c4b877 100755
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays debugger generic hashtables io assocs
-kernel.private kernel math memory namespaces parser
+kernel.private kernel math memory namespaces make parser
 prettyprint sequences vectors words system splitting
 init io.files bootstrap.image bootstrap.image.private vocabs
 vocabs.loader system debugger continuations ;
diff --git a/core/classes/classes.factor b/core/classes/classes.factor
index 5ec96bbbb0..67a789a1dc 100755
--- a/core/classes/classes.factor
+++ b/core/classes/classes.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays definitions assocs kernel kernel.private
-slots.private namespaces sequences strings words vectors math
-quotations combinators sorting effects graphs vocabs sets ;
+slots.private namespaces make sequences strings words vectors
+math quotations combinators sorting effects graphs vocabs sets ;
 IN: classes
 
 SYMBOL: class<=-cache
diff --git a/core/classes/predicate/predicate.factor b/core/classes/predicate/predicate.factor
index e6d6b5a0d4..4ba93acae4 100755
--- a/core/classes/predicate/predicate.factor
+++ b/core/classes/predicate/predicate.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: classes classes.algebra kernel namespaces words sequences
-quotations arrays kernel.private assocs combinators ;
+USING: classes classes.algebra kernel namespaces make words
+sequences quotations arrays kernel.private assocs combinators ;
 IN: classes.predicate
 
 PREDICATE: predicate-class < class
diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor
index 531658a5e0..c190ce85e7 100644
--- a/core/classes/tuple/parser/parser.factor
+++ b/core/classes/tuple/parser/parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel sets namespaces sequences parser
+USING: accessors kernel sets namespaces make sequences parser
 lexer combinators words classes.parser classes.tuple arrays
 slots math assocs ;
 IN: classes.tuple.parser
diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor
index b5c3658542..f92c9c0fd5 100755
--- a/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays definitions hashtables kernel kernel.private math
-namespaces sequences sequences.private strings vectors words
-quotations memory combinators generic classes classes.algebra
-classes.builtin classes.private slots.private slots
-compiler.units math.private accessors assocs effects ;
+namespaces make sequences sequences.private strings vectors
+words quotations memory combinators generic classes
+classes.algebra classes.builtin classes.private slots.private
+slots compiler.units math.private accessors assocs effects ;
 IN: classes.tuple
 
 PREDICATE: tuple-class < class
diff --git a/core/compiler/errors/errors.factor b/core/compiler/errors/errors.factor
index e21348fd19..7a28c1fb99 100755
--- a/core/compiler/errors/errors.factor
+++ b/core/compiler/errors/errors.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces assocs io sequences
+USING: kernel namespaces make assocs io sequences
 sorting continuations math math.parser ;
 IN: compiler.errors
 
diff --git a/core/continuations/continuations.factor b/core/continuations/continuations.factor
index bfa3848186..6dde851963 100755
--- a/core/continuations/continuations.factor
+++ b/core/continuations/continuations.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays vectors kernel kernel.private sequences
-namespaces math splitting sorting quotations assocs
+namespaces make math splitting sorting quotations assocs
 combinators accessors ;
 IN: continuations
 
diff --git a/core/destructors/destructors.factor b/core/destructors/destructors.factor
index 154e1c30ac..afc956fae4 100755
--- a/core/destructors/destructors.factor
+++ b/core/destructors/destructors.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2007, 2008 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors continuations kernel namespaces
+USING: accessors continuations kernel namespaces make
 sequences vectors ;
 IN: destructors
 
diff --git a/core/effects/effects.factor b/core/effects/effects.factor
index 8a000b0615..0c082477c7 100755
--- a/core/effects/effects.factor
+++ b/core/effects/effects.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.parser namespaces sequences strings
+USING: kernel math math.parser namespaces make sequences strings
 words assocs combinators accessors arrays ;
 IN: effects
 
diff --git a/core/generic/generic.factor b/core/generic/generic.factor
index c0a21dbaba..026e372912 100755
--- a/core/generic/generic.factor
+++ b/core/generic/generic.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors words kernel sequences namespaces assocs
+USING: accessors words kernel sequences namespaces make assocs
 hashtables definitions kernel.private classes classes.private
 classes.algebra quotations arrays vocabs effects combinators
 sets ;
diff --git a/core/generic/math/math.factor b/core/generic/math/math.factor
index 834e19d9d9..077795c4b7 100755
--- a/core/generic/math/math.factor
+++ b/core/generic/math/math.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays generic hashtables kernel kernel.private
-math namespaces sequences words quotations layouts combinators
+USING: arrays generic hashtables kernel kernel.private math
+namespaces make sequences words quotations layouts combinators
 sequences.private classes classes.builtin classes.algebra
 definitions math.order ;
 IN: generic.math
diff --git a/core/generic/standard/engines/tag/tag.factor b/core/generic/standard/engines/tag/tag.factor
index 02a7af105f..50813f191c 100644
--- a/core/generic/standard/engines/tag/tag.factor
+++ b/core/generic/standard/engines/tag/tag.factor
@@ -1,4 +1,6 @@
-USING: classes.private generic.standard.engines namespaces
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: classes.private generic.standard.engines namespaces make
 arrays assocs sequences.private quotations kernel.private
 math slots.private math.private kernel accessors words
 layouts ;
diff --git a/core/generic/standard/engines/tuple/tuple.factor b/core/generic/standard/engines/tuple/tuple.factor
index 325f2ebb39..8c61aa4240 100644
--- a/core/generic/standard/engines/tuple/tuple.factor
+++ b/core/generic/standard/engines/tuple/tuple.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel classes.tuple.private hashtables assocs sorting
 accessors combinators sequences slots.private math.parser words
-effects namespaces generic generic.standard.engines
+effects namespaces make generic generic.standard.engines
 classes.algebra math math.private kernel.private
 quotations arrays definitions ;
 IN: generic.standard.engines.tuple
diff --git a/core/generic/standard/standard-tests.factor b/core/generic/standard/standard-tests.factor
index 52d73a9a4c..f6635276b3 100644
--- a/core/generic/standard/standard-tests.factor
+++ b/core/generic/standard/standard-tests.factor
@@ -1,7 +1,7 @@
 IN: generic.standard.tests
 USING: tools.test math math.functions math.constants
 generic.standard strings sequences arrays kernel accessors
-words float-arrays byte-arrays bit-arrays parser namespaces
+words float-arrays byte-arrays bit-arrays parser namespaces make
 quotations stack-checker vectors growable hashtables sbufs
 prettyprint byte-vectors bit-vectors float-vectors definitions
 generic sets graphs assocs ;
diff --git a/core/generic/standard/standard.factor b/core/generic/standard/standard.factor
index 860781e5e2..d22d20a0fc 100644
--- a/core/generic/standard/standard.factor
+++ b/core/generic/standard/standard.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs kernel kernel.private slots.private math
-namespaces sequences vectors words quotations definitions
+namespaces make sequences vectors words quotations definitions
 hashtables layouts combinators sequences.private generic
 classes classes.algebra classes.private generic.standard.engines
 generic.standard.engines.tag generic.standard.engines.predicate
diff --git a/core/hashtables/hashtables-tests.factor b/core/hashtables/hashtables-tests.factor
index abf3747244..a59c649598 100755
--- a/core/hashtables/hashtables-tests.factor
+++ b/core/hashtables/hashtables-tests.factor
@@ -1,5 +1,5 @@
 IN: hashtables.tests
-USING: kernel math namespaces tools.test vectors sequences
+USING: kernel math namespaces make tools.test vectors sequences
 sequences.private hashtables io prettyprint assocs
 continuations ;
 
diff --git a/core/io/io-tests.factor b/core/io/io-tests.factor
index af40cf8737..c38a7c9ebc 100755
--- a/core/io/io-tests.factor
+++ b/core/io/io-tests.factor
@@ -1,5 +1,5 @@
 USING: arrays io io.files kernel math parser strings system
-tools.test words namespaces io.encodings.8-bit
+tools.test words namespaces make io.encodings.8-bit
 io.encodings.binary sequences ;
 IN: io.tests
 
diff --git a/core/io/io.factor b/core/io/io.factor
index a03aaac6d8..0d5a857490 100755
--- a/core/io/io.factor
+++ b/core/io/io.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2003, 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: hashtables generic kernel math namespaces sequences
+USING: hashtables generic kernel math namespaces make sequences
 continuations destructors assocs ;
 IN: io
 
diff --git a/core/io/streams/c/c.factor b/core/io/streams/c/c.factor
index de6d8519ca..780d892d2e 100755
--- a/core/io/streams/c/c.factor
+++ b/core/io/streams/c/c.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel kernel.private namespaces io io.encodings
+USING: kernel kernel.private namespaces make io io.encodings
 sequences math generic threads.private classes io.backend
 io.files continuations destructors byte-arrays accessors ;
 IN: io.streams.c
diff --git a/core/io/streams/string/string-tests.factor b/core/io/streams/string/string-tests.factor
index 3512ac871d..a6502046c8 100644
--- a/core/io/streams/string/string-tests.factor
+++ b/core/io/streams/string/string-tests.factor
@@ -1,4 +1,5 @@
-USING: io.streams.string io kernel arrays namespaces tools.test ;
+USING: io.streams.string io kernel arrays namespaces make
+tools.test ;
 IN: io.streams.string.tests
 
 [ "line 1" CHAR: l ]
diff --git a/core/kernel/kernel-tests.factor b/core/kernel/kernel-tests.factor
index 5cb4abc2e9..8a51d45447 100755
--- a/core/kernel/kernel-tests.factor
+++ b/core/kernel/kernel-tests.factor
@@ -1,6 +1,7 @@
 USING: arrays byte-arrays kernel kernel.private math memory
 namespaces sequences tools.test math.private quotations
-continuations prettyprint io.streams.string debugger assocs ;
+continuations prettyprint io.streams.string debugger assocs
+sequences.private ;
 IN: kernel.tests
 
 [ 0 ] [ f size ] unit-test
@@ -118,7 +119,8 @@ IN: kernel.tests
 
 [ total-failure-1 ] must-fail
 
-! From combinators.lib
 [ 1 1 2 2 3 3 ] [ 1 2 3 [ dup ] tri@ ] unit-test
 [ 1 4 9 ] [ 1 2 3 [ sq ] tri@ ] unit-test
 [ [ sq ] tri@ ] must-infer
+
+[ 4 ] [ 1 { [ 1 ] [ 2 ] } dispatch sq ] unit-test
diff --git a/core/make/make-docs.factor b/core/make/make-docs.factor
new file mode 100644
index 0000000000..269f4fb26b
--- /dev/null
+++ b/core/make/make-docs.factor
@@ -0,0 +1,30 @@
+IN: make
+USING: help.markup help.syntax quotations sequences math.parser
+kernel ;
+
+ARTICLE: "namespaces-make" "Making sequences with variables"
+"The " { $vocab-link "make" } " vocabulary implements a facility for constructing sequences by holding an accumulator sequence in a variable. Storing the accumulator sequence in a variable rather than the stack may allow code to be written with less stack manipulation."
+{ $subsection make }
+{ $subsection , }
+{ $subsection % }
+{ $subsection # }
+"The accumulator sequence can be accessed directly:"
+{ $subsection building } ;
+
+ABOUT: "namespaces-make"
+
+HELP: building
+{ $var-description "Temporary mutable growable sequence holding elements accumulated so far by " { $link make } "." } ;
+
+HELP: make
+{ $values { "quot" quotation } { "exemplar" sequence } { "seq" "a new sequence" } }
+{ $description "Calls the quotation in a new " { $emphasis "dynamic scope" } ". The quotation and any words it calls can execute the " { $link , } " and " { $link % } " words to accumulate elements. When the quotation returns, all accumulated elements are collected into a sequence with the same type as " { $snippet "exemplar" } "." }
+{ $examples { $example "USING: make prettyprint ;" "[ 1 , 2 , 3 , ] { } make ." "{ 1 2 3 }" } } ;
+
+HELP: ,
+{ $values { "elt" object } }
+{ $description "Adds an element to the end of the sequence being constructed by " { $link make } "." } ;
+
+HELP: %
+{ $values { "seq" sequence } }
+{ $description "Appends a sequence to the end of the sequence being constructed by " { $link make } "." } ;
diff --git a/core/make/make.factor b/core/make/make.factor
new file mode 100644
index 0000000000..f8bdaa1dbb
--- /dev/null
+++ b/core/make/make.factor
@@ -0,0 +1,19 @@
+! Copyright (C) 2003, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel sequences namespaces ;
+IN: make
+
+SYMBOL: building
+
+: make ( quot exemplar -- seq )
+    [
+        [
+            1024 swap new-resizable [
+                building set call
+            ] keep
+        ] keep like
+    ] with-scope ; inline
+
+: , ( elt -- ) building get push ;
+
+: % ( seq -- ) building get push-all ;
diff --git a/core/math/math-tests.factor b/core/math/math-tests.factor
index d72bb67970..c2077eb790 100644
--- a/core/math/math-tests.factor
+++ b/core/math/math-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel math namespaces tools.test ;
+USING: kernel math namespaces make tools.test ;
 IN: math.tests
 
 [ ] [ 5 [ ] times ] unit-test
diff --git a/core/math/parser/parser-docs.factor b/core/math/parser/parser-docs.factor
index 1d2a24057c..bcc75a842a 100644
--- a/core/math/parser/parser-docs.factor
+++ b/core/math/parser/parser-docs.factor
@@ -1,5 +1,5 @@
 USING: help.markup help.syntax math math.private prettyprint
-namespaces strings ;
+namespaces make strings ;
 IN: math.parser
 
 ARTICLE: "number-strings" "Converting between numbers and strings"
diff --git a/core/math/parser/parser.factor b/core/math/parser/parser.factor
index 05e267f035..04d8fb6a41 100755
--- a/core/math/parser/parser.factor
+++ b/core/math/parser/parser.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math.private namespaces sequences strings arrays
-combinators splitting math assocs ;
+USING: kernel math.private namespaces make sequences strings
+arrays combinators splitting math assocs ;
 IN: math.parser
 
 : digit> ( ch -- n )
diff --git a/core/namespaces/namespaces-docs.factor b/core/namespaces/namespaces-docs.factor
index 1da3bc45db..f410148566 100755
--- a/core/namespaces/namespaces-docs.factor
+++ b/core/namespaces/namespaces-docs.factor
@@ -22,13 +22,6 @@ ARTICLE: "namespaces-global" "Global variables"
 { $subsection get-global }
 { $subsection set-global } ;
 
-ARTICLE: "namespaces-make" "Constructing sequences"
-"There is a lexicon of words for constructing sequences without passing the partial sequence being built on the stack. This reduces stack noise."
-{ $subsection make }
-{ $subsection , }
-{ $subsection % }
-{ $subsection # } ;
-
 ARTICLE: "namespaces.private" "Namespace implementation details"
 "The namestack holds namespaces."
 { $subsection namestack }
@@ -50,8 +43,6 @@ $nl
 { $subsection "namespaces-change" }
 { $subsection "namespaces-combinators" }
 { $subsection "namespaces-global" }
-"A useful facility for constructing sequences by holding an accumulator sequence in a variable:"
-{ $subsection "namespaces-make" }
 "Implementation details your code probably does not care about:"
 { $subsection "namespaces.private" }
 "An alternative to dynamic scope is lexical scope. Lexically-scoped values and closures are implemented in the " { $vocab-link "locals" } " vocabulary." ;
@@ -162,22 +153,6 @@ HELP: >n
 HELP: ndrop
 { $description "Pops a namespace from the name stack." } ;
 
-HELP: building
-{ $var-description "Temporary mutable growable sequence holding elements accumulated so far by " { $link make } "." } ;
-
-HELP: make
-{ $values { "quot" quotation } { "exemplar" "a sequence" } { "seq" "a new sequence" } }
-{ $description "Calls the quotation in a new " { $emphasis "dynamic scope" } ". The quotation and any words it calls can execute the " { $link , } " and " { $link % } " words to accumulate elements. When the quotation returns, all accumulated elements are collected into a sequence with the same type as " { $snippet "exemplar" } "." }
-{ $examples { $example "USING: namespaces prettyprint ;" "[ 1 , 2 , 3 , ] { } make ." "{ 1 2 3 }" } } ;
-
-HELP: ,
-{ $values { "elt" object } }
-{ $description "Adds an element to the end of the sequence being constructed by " { $link make } "." } ;
-
-HELP: %
-{ $values { "seq" "a sequence" } }
-{ $description "Appends a sequence to the end of the sequence being constructed by " { $link make } "." } ;
-
 HELP: init-namespaces
 { $description "Resets the name stack to its initial state, holding a single copy of the global namespace." }
 $low-level-note ;
diff --git a/core/namespaces/namespaces.factor b/core/namespaces/namespaces.factor
index 3d3d3c554b..20400f4e54 100644
--- a/core/namespaces/namespaces.factor
+++ b/core/namespaces/namespaces.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2003, 2007 Slava Pestov.
+! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel vectors sequences hashtables
 arrays kernel.private math strings assocs ;
@@ -6,9 +6,7 @@ IN: namespaces
 
 <PRIVATE
 
-: namestack* ( -- namestack )
-    0 getenv { vector } declare ; inline
-
+: namestack* ( -- namestack ) 0 getenv { vector } declare ; inline
 : >n ( namespace -- ) namestack* push ;
 : ndrop ( -- ) namestack* pop* ;
 
@@ -25,18 +23,11 @@ PRIVATE>
 : off ( variable -- ) f swap set ; inline
 : get-global ( variable -- value ) global at ;
 : set-global ( value variable -- ) global set-at ;
-
-: change ( variable quot -- )
-    >r dup get r> rot slip set ; inline
-
+: change ( variable quot -- ) >r dup get r> rot slip set ; inline
 : +@ ( n variable -- ) [ 0 or + ] change ;
-
 : inc ( variable -- ) 1 swap +@ ; inline
-
 : dec ( variable -- ) -1 swap +@ ; inline
-
 : bind ( ns quot -- ) swap >n call ndrop ; inline
-
 : counter ( variable -- n ) global [ dup inc get ] bind ;
 
 : make-assoc ( quot exemplar -- hash )
@@ -47,19 +38,3 @@ PRIVATE>
 
 : with-variable ( value key quot -- )
     >r associate >n r> call ndrop ; inline
-
-! Building sequences
-SYMBOL: building
-
-: make ( quot exemplar -- seq )
-    [
-        [
-            1024 swap new-resizable [
-                building set call
-            ] keep
-        ] keep like
-    ] with-scope ; inline
-
-: , ( elt -- ) building get push ;
-
-: % ( seq -- ) building get push-all ;
diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 563a3ed5b0..6f755e5cb5 100755
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -74,7 +74,7 @@ INSTANCE: immutable-sequence sequence
 : set-array-nth ( elt n array -- )
     swap 2 fixnum+fast set-slot ; inline
 
-: dispatch ( n array -- ) array-nth (call) ;
+: dispatch ( n array -- ) array-nth call ;
 
 GENERIC: resize ( n seq -- newseq ) flushable
 
@@ -236,6 +236,10 @@ INSTANCE: repetition immutable-sequence
 
 <PRIVATE
 
+: check-length ( n -- n )
+    #! Ricing.
+    dup integer? [ "length not an integer" throw ] unless ; inline
+
 : ((copy)) ( dst i src j n -- dst i src j n )
     dup -roll [
         + swap nth-unsafe -roll [
@@ -248,8 +252,9 @@ INSTANCE: repetition immutable-sequence
     inline recursive
 
 : prepare-subseq ( from to seq -- dst i src j n )
+    #! The check-length call forces partial dispatch
     [ >r swap - r> new-sequence dup 0 ] 3keep
-    -rot drop roll length ; inline
+    -rot drop roll length check-length ; inline
 
 : check-copy ( src n dst -- )
     over 0 < [ bounds-error ] when
@@ -273,7 +278,8 @@ PRIVATE>
 : but-last ( seq -- headseq ) 1 head* ;
 
 : copy ( src i dst -- )
-    pick length >r 3dup check-copy spin 0 r>
+    #! The check-length call forces partial dispatch
+    pick length check-length >r 3dup check-copy spin 0 r>
     (copy) drop ; inline
 
 M: sequence clone-like
@@ -739,10 +745,10 @@ PRIVATE>
     [ but-last ] [ peek ] bi ;
 
 : unclip-slice ( seq -- rest first )
-    [ rest-slice ] [ first ] bi ;
+    [ rest-slice ] [ first ] bi ; inline
 
 : unclip-last-slice ( seq -- butlast last )
-    [ but-last-slice ] [ peek ] bi ;
+    [ but-last-slice ] [ peek ] bi ; inline
 
 : <flat-slice> ( seq -- slice )
     dup slice? [ { } like ] when 0 over length rot <slice> ;
diff --git a/core/slots/slots.factor b/core/slots/slots.factor
index 6f831c30c5..d4ae60ca94 100755
--- a/core/slots/slots.factor
+++ b/core/slots/slots.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays byte-arrays kernel kernel.private math namespaces
-sequences strings words effects generic generic.standard classes
-classes.algebra slots.private combinators accessors words
-sequences.private assocs alien ;
+make sequences strings words effects generic generic.standard
+classes classes.algebra slots.private combinators accessors
+words sequences.private assocs alien ;
 IN: slots
 
 TUPLE: slot-spec name offset class initial read-only ;
diff --git a/core/splitting/splitting.factor b/core/splitting/splitting.factor
index 38f5ae0891..aac32784a1 100755
--- a/core/splitting/splitting.factor
+++ b/core/splitting/splitting.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math namespaces strings arrays vectors sequences
+USING: kernel math make strings arrays vectors sequences
 sets math.order accessors ;
 IN: splitting
 
diff --git a/core/strings/parser/parser.factor b/core/strings/parser/parser.factor
index 8d95254539..2695860a59 100644
--- a/core/strings/parser/parser.factor
+++ b/core/strings/parser/parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel assocs namespaces splitting sequences
+USING: kernel assocs namespaces make splitting sequences
 strings math.parser lexer accessors ;
 IN: strings.parser
 
diff --git a/core/strings/strings-tests.factor b/core/strings/strings-tests.factor
index d10f1603f1..078785178b 100755
--- a/core/strings/strings-tests.factor
+++ b/core/strings/strings-tests.factor
@@ -1,6 +1,6 @@
-USING: continuations kernel math math.order namespaces strings
-strings.private sbufs tools.test sequences vectors arrays memory
-prettyprint io.streams.null ;
+USING: continuations kernel math math.order namespaces make
+strings strings.private sbufs tools.test sequences vectors
+arrays memory prettyprint io.streams.null ;
 IN: strings.tests
 
 [ CHAR: b ] [ 1 >bignum "abc" nth ] unit-test
diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 4677a7b5d7..44f538d5d9 100755
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces sequences io.files kernel assocs words vocabs
-definitions parser continuations io hashtables sorting
+USING: namespaces make sequences io.files kernel assocs words
+vocabs definitions parser continuations io hashtables sorting
 source-files arrays combinators strings system math.parser
 compiler.errors splitting init accessors ;
 IN: vocabs.loader
diff --git a/extra/asn1/asn1.factor b/extra/asn1/asn1.factor
index df5d11be75..bd1ed83baa 100644
--- a/extra/asn1/asn1.factor
+++ b/extra/asn1/asn1.factor
@@ -3,7 +3,7 @@
 
 USING: arrays asn1.ldap assocs byte-arrays combinators
 continuations io io.binary io.streams.string kernel math
-math.parser namespaces pack strings sequences accessors ;
+math.parser namespaces make pack strings sequences accessors ;
 
 IN: asn1
 
diff --git a/extra/backtrack/backtrack.factor b/extra/backtrack/backtrack.factor
index df397025f6..9bef16d609 100755
--- a/extra/backtrack/backtrack.factor
+++ b/extra/backtrack/backtrack.factor
@@ -20,9 +20,9 @@ M: amb-failure summary drop "Backtracking failure" ;
     [ fail ] unless ;
 
 MACRO: checkpoint ( quot -- quot' )
-    '[ failure get ,
-       '[ '[ failure set , continue ] callcc0
-          , failure set @ ] callcc0 ] ;
+    '[ failure get _
+       '[ '[ failure set _ continue ] callcc0
+          _ failure set @ ] callcc0 ] ;
 
 : number-from ( from -- from+n )
     [ 1 + number-from ] checkpoint ;
@@ -42,7 +42,7 @@ MACRO: unsafe-amb ( seq -- quot )
     dup length 1 =
     [ first 1quotation ]
     [ [ first ] [ rest ] bi
-      '[ , [ drop , unsafe-amb ] checkpoint ] ] if ;
+      '[ _ [ drop _ unsafe-amb ] checkpoint ] ] if ;
 
 PRIVATE> 
 
@@ -55,7 +55,7 @@ PRIVATE>
 
 MACRO: amb-execute ( seq -- quot )
     [ length 1 - ] [ <enum> [ 1quotation ] assoc-map ] bi
-    '[ , 0 unsafe-number-from-to nip , case ] ;
+    '[ _ 0 unsafe-number-from-to nip _ case ] ;
 
 : if-amb ( true false -- )
     [
diff --git a/extra/bank/bank-tests.factor b/extra/bank/bank-tests.factor
index 2aa31f1e85..5014d53019 100644
--- a/extra/bank/bank-tests.factor
+++ b/extra/bank/bank-tests.factor
@@ -1,4 +1,5 @@
-USING: accessors arrays bank calendar kernel math math.functions namespaces tools.test tools.walker ;
+USING: accessors arrays bank calendar kernel math math.functions
+namespaces make tools.test tools.walker ;
 IN: bank.tests
 
 SYMBOL: my-account
diff --git a/extra/benchmark/dispatch2/dispatch2.factor b/extra/benchmark/dispatch2/dispatch2.factor
index 7145cd94f7..93b42c3e6c 100644
--- a/extra/benchmark/dispatch2/dispatch2.factor
+++ b/extra/benchmark/dispatch2/dispatch2.factor
@@ -1,4 +1,4 @@
-USING: namespaces math sequences splitting grouping
+USING: make math sequences splitting grouping
 kernel columns float-arrays bit-arrays ;
 IN: benchmark.dispatch2
 
diff --git a/extra/benchmark/dispatch3/dispatch3.factor b/extra/benchmark/dispatch3/dispatch3.factor
index d780980941..aa3d11e2fb 100644
--- a/extra/benchmark/dispatch3/dispatch3.factor
+++ b/extra/benchmark/dispatch3/dispatch3.factor
@@ -1,5 +1,5 @@
 USING: sequences math mirrors splitting grouping
-kernel namespaces assocs alien.syntax columns
+kernel make assocs alien.syntax columns
 float-arrays bit-arrays ;
 IN: benchmark.dispatch3
 
diff --git a/extra/benchmark/mandel/colors/colors.factor b/extra/benchmark/mandel/colors/colors.factor
index 848fbae01e..7bbb25a47d 100644
--- a/extra/benchmark/mandel/colors/colors.factor
+++ b/extra/benchmark/mandel/colors/colors.factor
@@ -16,4 +16,4 @@ IN: benchmark.mandel.colors
     ] with map ;
 
 : color-map ( -- map )
-    nb-iter max-color min <color-map> ; foldable
+    max-iterations max-color min <color-map> ; foldable
diff --git a/extra/benchmark/mandel/mandel.factor b/extra/benchmark/mandel/mandel.factor
index a40b123ed3..64a673c8ec 100755
--- a/extra/benchmark/mandel/mandel.factor
+++ b/extra/benchmark/mandel/mandel.factor
@@ -1,16 +1,10 @@
-USING: arrays io kernel math math.functions math.order
-math.parser sequences locals byte-arrays byte-vectors io.files
-io.encodings.binary benchmark.mandel.params
-benchmark.mandel.colors ;
+! Copyright (C) 2005, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: io kernel math math.functions sequences prettyprint
+io.files io.encodings io.encodings.ascii io.encodings.binary fry
+benchmark.mandel.params benchmark.mandel.colors ;
 IN: benchmark.mandel
 
-: iter ( c z nb-iter -- x )
-    dup 0 <= [ 2nip ] [
-        over absq 4.0 >= [ 2nip ] [
-            >r sq dupd + r> 1- iter
-        ] if
-    ] if ; inline recursive
-
 : x-inc width  200000 zoom-fact * / ; inline
 : y-inc height 150000 zoom-fact * / ; inline
 
@@ -19,29 +13,25 @@ IN: benchmark.mandel
     [ y-inc * center imaginary-part y-inc height 2 / * - + >float ] bi*
     rect> ; inline
 
-:: render ( accum -- )
-    height [
-        width swap [
-            c C{ 0.0 0.0 } nb-iter iter dup zero?
-            [ drop B{ 0 0 0 } ] [ color-map [ length mod ] keep nth ] if
-            accum push-all
-        ] curry each
-    ] each ; inline
+: count-iterations ( z max-iterations step-quot test-quot -- #iters )
+    '[ drop @ dup @ ] find-last-integer nip ; inline
 
-:: ppm-header ( accum -- )
-    "P6\n" accum push-all
-    width number>string accum push-all
-    " " accum push-all
-    height number>string accum push-all
-    "\n255\n" accum push-all ; inline
+: pixel ( c -- iterations )
+    [ C{ 0.0 0.0 } max-iterations ] dip
+    '[ sq _ + ] [ absq 4.0 >= ] count-iterations ; inline
 
-: buf-size ( -- n ) width height * 3 * 100 + ; inline
+: color ( iterations -- color )
+    [ color-map [ length mod ] keep nth ] [ B{ 0 0 0 } ] if* ; inline
 
-: mandel ( -- data )
-    buf-size <byte-vector>
-    [ ppm-header ] [ render ] [ B{ } like ] tri ;
+: render ( -- )
+    height [ width swap '[ _ c pixel color write ] each ] each ; inline
+
+: ppm-header ( -- )
+    ascii encode-output
+    "P6\n" write width pprint " " write height pprint "\n255\n" write
+    binary encode-output ; inline
 
 : mandel-main ( -- )
-    mandel "mandel.ppm" temp-file binary set-file-contents ;
+    "mandel.ppm" temp-file binary [ ppm-header render ] with-file-writer ;
 
 MAIN: mandel-main
diff --git a/extra/benchmark/mandel/params/params.factor b/extra/benchmark/mandel/params/params.factor
index 3fcfe1d3ef..c40d3c1f2d 100644
--- a/extra/benchmark/mandel/params/params.factor
+++ b/extra/benchmark/mandel/params/params.factor
@@ -1,8 +1,8 @@
 IN: benchmark.mandel.params
 
-: max-color 360   ; inline
-: zoom-fact 0.8   ; inline
-: width     640   ; inline
-: height    480   ; inline
-: nb-iter   40    ; inline
-: center    -0.65 ; inline
+: max-color       360   ; inline
+: zoom-fact       0.8   ; inline
+: width           640   ; inline
+: height          480   ; inline
+: max-iterations  40    ; inline
+: center         -0.65  ; inline
diff --git a/extra/benchmark/nsieve-bits/nsieve-bits.factor b/extra/benchmark/nsieve-bits/nsieve-bits.factor
index 4970b018da..ddb70972b9 100644
--- a/extra/benchmark/nsieve-bits/nsieve-bits.factor
+++ b/extra/benchmark/nsieve-bits/nsieve-bits.factor
@@ -1,6 +1,6 @@
 IN: benchmark.nsieve-bits
 USING: math math.parser sequences sequences.private kernel
-bit-arrays namespaces io ;
+bit-arrays make io ;
 
 : clear-flags ( step i seq -- )
     2dup length >= [
diff --git a/extra/benchmark/nsieve-bytes/nsieve-bytes.factor b/extra/benchmark/nsieve-bytes/nsieve-bytes.factor
new file mode 100644
index 0000000000..11745e4463
--- /dev/null
+++ b/extra/benchmark/nsieve-bytes/nsieve-bytes.factor
@@ -0,0 +1,35 @@
+IN: benchmark.nsieve-bytes
+USING: math math.parser sequences sequences.private kernel
+byte-arrays make io ;
+
+: clear-flags ( step i seq -- )
+    2dup length >= [
+        3drop
+    ] [
+        0 2over set-nth-unsafe >r over + r> clear-flags
+    ] if ; inline recursive
+
+: (nsieve) ( count i seq -- count )
+    2dup length < [
+        2dup nth-unsafe 0 > [
+            over dup 2 * pick clear-flags
+            rot 1+ -rot ! increment count
+        ] when >r 1+ r> (nsieve)
+    ] [
+        2drop
+    ] if ; inline recursive
+
+: nsieve ( m -- count )
+    0 2 rot 1+ <byte-array> dup [ drop 1 ] change-each (nsieve) ;
+
+: nsieve. ( m -- )
+    [ "Primes up to " % dup # " " % nsieve # ] "" make print ;
+
+: nsieve-main ( n -- )
+    dup 2^ 10000 * nsieve.
+    dup 1 - 2^ 10000 * nsieve.
+    2 - 2^ 10000 * nsieve. ;
+
+: nsieve-main* ( -- ) 9 nsieve-main ;
+
+MAIN: nsieve-main*
diff --git a/extra/benchmark/nsieve/nsieve.factor b/extra/benchmark/nsieve/nsieve.factor
index dd46962322..76d991f734 100644
--- a/extra/benchmark/nsieve/nsieve.factor
+++ b/extra/benchmark/nsieve/nsieve.factor
@@ -1,6 +1,6 @@
 IN: benchmark.nsieve
 USING: math math.parser sequences sequences.private kernel
-arrays namespaces io ;
+arrays make io ;
 
 : clear-flags ( step i seq -- )
     2dup length >= [
diff --git a/extra/benchmark/raytracer/raytracer.factor b/extra/benchmark/raytracer/raytracer.factor
index d22f339ed4..69454505a5 100755
--- a/extra/benchmark/raytracer/raytracer.factor
+++ b/extra/benchmark/raytracer/raytracer.factor
@@ -3,7 +3,7 @@
 
 USING: arrays accessors float-arrays io io.files
 io.encodings.binary kernel math math.functions math.vectors
-math.parser namespaces sequences sequences.private words ;
+math.parser make sequences sequences.private words ;
 IN: benchmark.raytracer
 
 ! parameters
diff --git a/extra/bitfields/bitfields.factor b/extra/bitfields/bitfields.factor
index 76e8d7883d..5eb41cd943 100755
--- a/extra/bitfields/bitfields.factor
+++ b/extra/bitfields/bitfields.factor
@@ -1,6 +1,6 @@
-USING: parser lexer kernel math sequences namespaces assocs summary
-words splitting math.parser arrays sequences.next mirrors
-generalizations compiler.units ;
+USING: parser lexer kernel math sequences namespaces make assocs
+summary words splitting math.parser arrays sequences.next
+mirrors generalizations compiler.units ;
 IN: bitfields
 
 ! Example:
diff --git a/extra/builder/release/upload/upload.factor b/extra/builder/release/upload/upload.factor
index 32a27f82fd..19d3936fd9 100644
--- a/extra/builder/release/upload/upload.factor
+++ b/extra/builder/release/upload/upload.factor
@@ -1,5 +1,5 @@
 
-USING: kernel namespaces sequences arrays io io.files
+USING: kernel namespaces make sequences arrays io io.files
        builder.util
        builder.common
        builder.release.archive ;
diff --git a/extra/cfdg/cfdg.factor b/extra/cfdg/cfdg.factor
index 121c835105..99d5dbbc48 100644
--- a/extra/cfdg/cfdg.factor
+++ b/extra/cfdg/cfdg.factor
@@ -1,5 +1,5 @@
 
-USING: kernel alien.c-types combinators namespaces arrays
+USING: kernel alien.c-types combinators namespaces make arrays
        sequences sequences.lib namespaces.lib splitting
        math math.functions math.vectors math.trig
        opengl.gl opengl.glu opengl ui ui.gadgets.slate
diff --git a/extra/combinators/cleave/cleave.factor b/extra/combinators/cleave/cleave.factor
index f5aeeff619..e57116a25b 100755
--- a/extra/combinators/cleave/cleave.factor
+++ b/extra/combinators/cleave/cleave.factor
@@ -21,7 +21,7 @@ MACRO: ncleave ( seq n -- quot ) [ncleave] ;
 ! Cleave into array
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: [narr] ( seq n -- quot ) over length '[ , , ncleave , narray ] ;
+: [narr] ( seq n -- quot ) over length '[ _ _ ncleave _ narray ] ;
 
 MACRO: narr ( seq n -- array ) [narr] ;
 
@@ -34,11 +34,11 @@ MACRO: 3arr ( seq -- array ) 3 [narr] ;
 
 MACRO: <arr> ( seq -- )
   [ >quots ] [ length ] bi
- '[ , cleave , narray ] ;
+ '[ _ cleave _ narray ] ;
 
 MACRO: <2arr> ( seq -- )
   [ >quots ] [ length ] bi
- '[ , 2cleave , narray ] ;
+ '[ _ 2cleave _ narray ] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -58,7 +58,7 @@ MACRO: <2arr> ( seq -- )
 
 MACRO: <arr*> ( seq -- )
   [ >quots ] [ length ] bi
- '[ , spread , narray ] ;
+ '[ _ spread _ narray ] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
diff --git a/extra/combinators/conditional/conditional.factor b/extra/combinators/conditional/conditional.factor
index cb27ef3f55..3c9d6d2436 100644
--- a/extra/combinators/conditional/conditional.factor
+++ b/extra/combinators/conditional/conditional.factor
@@ -5,7 +5,7 @@ IN: combinators.conditional
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-MACRO: 1if ( test then else -- ) '[ dup @ , , if ] ;
+MACRO: 1if ( test then else -- ) '[ dup @ _ _ if ] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
diff --git a/extra/combinators/lib/lib.factor b/extra/combinators/lib/lib.factor
index b2577e6636..dd8fbd89f5 100755
--- a/extra/combinators/lib/lib.factor
+++ b/extra/combinators/lib/lib.factor
@@ -2,7 +2,7 @@
 !                          Doug Coleman, Eduardo Cavazos,
 !                          Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel combinators fry namespaces quotations hashtables
+USING: kernel combinators fry namespaces make quotations hashtables
 sequences assocs arrays stack-checker effects math math.ranges
 generalizations macros continuations random locals accessors ;
 
@@ -65,10 +65,10 @@ IN: combinators.lib
 MACRO: preserving ( predicate -- quot )
     dup infer in>>
     dup 1+
-    '[ , , nkeep , nrot ] ;
+    '[ _ _ nkeep _ nrot ] ;
 
 MACRO: ifte ( quot quot quot -- )
-    '[ , preserving , , if ] ;
+    '[ _ preserving _ _ if ] ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! switch
diff --git a/extra/coroutines/coroutines.factor b/extra/coroutines/coroutines.factor
index 3c1f8490c4..dc594abd2d 100644
--- a/extra/coroutines/coroutines.factor
+++ b/extra/coroutines/coroutines.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005 Chris Double, 2007 Clemens Hofreither.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel hashtables namespaces continuations quotations
+USING: kernel hashtables namespaces make continuations quotations
 accessors ;
 IN: coroutines
 
diff --git a/extra/ctags/ctags.factor b/extra/ctags/ctags.factor
index e8c5608375..38160de0e9 100644
--- a/extra/ctags/ctags.factor
+++ b/extra/ctags/ctags.factor
@@ -6,7 +6,7 @@
 
 USING: arrays kernel sequences io io.files io.backend
 io.encodings.ascii math.parser vocabs definitions
-namespaces words sorting ;
+namespaces make words sorting ;
 IN: ctags
 
 : ctag-word ( ctag -- word )
diff --git a/extra/ctags/etags/etags.factor b/extra/ctags/etags/etags.factor
index 8cc8c284b1..9fe63e914e 100644
--- a/extra/ctags/etags/etags.factor
+++ b/extra/ctags/etags/etags.factor
@@ -4,8 +4,8 @@
 ! Emacs Etags generator
 ! Alfredo Beaumont <alfredo.beaumont@gmail.com>
 USING: kernel sequences sorting assocs words prettyprint ctags
-io.encodings.ascii io.files math math.parser namespaces strings locals
-shuffle io.backend arrays ;
+io.encodings.ascii io.files math math.parser namespaces make
+strings shuffle io.backend arrays ;
 IN: ctags.etags
 
 : etag-at ( key hash -- vector )
diff --git a/extra/demos/demos.factor b/extra/demos/demos.factor
index 40149bafa9..b411df1e30 100644
--- a/extra/demos/demos.factor
+++ b/extra/demos/demos.factor
@@ -10,7 +10,7 @@ IN: demos
 : demo-vocabs ( -- seq ) "demos" tagged [ second ] map concat [ name>> ] map ;
 
 : <run-vocab-button> ( vocab-name -- button )
-  dup '[ drop [ , run ] call-listener ] <bevel-button> { 0 0 } >>align ;
+  dup '[ drop [ _ run ] call-listener ] <bevel-button> { 0 0 } >>align ;
 
 : <demo-runner> ( -- gadget )
   <pile> 1 >>fill demo-vocabs [ <run-vocab-button> add-gadget ] each ;
diff --git a/extra/display-stack/display-stack.factor b/extra/display-stack/display-stack.factor
index 8da252f294..98af43fec8 100644
--- a/extra/display-stack/display-stack.factor
+++ b/extra/display-stack/display-stack.factor
@@ -1,6 +1,6 @@
 
 USING: kernel namespaces sequences math
-       listener io prettyprint sequences.lib fry ;
+       listener io prettyprint sequences.lib bake bake.fry ;
 
 IN: display-stack
 
diff --git a/extra/dns/server/server.factor b/extra/dns/server/server.factor
index 16677d8761..ad16db7b41 100644
--- a/extra/dns/server/server.factor
+++ b/extra/dns/server/server.factor
@@ -2,7 +2,7 @@
 USING: kernel combinators sequences sets math threads namespaces continuations
        debugger io io.sockets unicode.case accessors destructors
        combinators.cleave combinators.lib combinators.short-circuit 
-       newfx fry
+       newfx bake bake.fry
        dns dns.util dns.misc ;
 
 IN: dns.server
diff --git a/extra/dns/util/util.factor b/extra/dns/util/util.factor
index 35af74b92a..96cf6c0a1e 100644
--- a/extra/dns/util/util.factor
+++ b/extra/dns/util/util.factor
@@ -1,5 +1,5 @@
 
-USING: kernel sequences sorting math math.order macros fry ;
+USING: kernel sequences sorting math math.order macros bake bake.fry ;
 
 IN: dns.util
 
diff --git a/extra/faq/faq.factor b/extra/faq/faq.factor
index 525cef68ed..1ab348e434 100644
--- a/extra/faq/faq.factor
+++ b/extra/faq/faq.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml kernel sequences xml.utilities combinators.lib
 math xml.data arrays assocs xml.generator xml.writer namespaces
-math.parser io accessors ;
+make math.parser io accessors ;
 IN: faq
 
 : find-after ( seq quot -- elem after )
diff --git a/extra/fjsc/fjsc.factor b/extra/fjsc/fjsc.factor
index ac3b447f1c..c308c94054 100755
--- a/extra/fjsc/fjsc.factor
+++ b/extra/fjsc/fjsc.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel peg strings sequences math
-math.parser namespaces words quotations arrays hashtables io
+USING: accessors kernel peg strings sequences math math.parser
+namespaces make words quotations arrays hashtables io
 io.streams.string assocs ascii peg.parsers accessors ;
 IN: fjsc
 
diff --git a/extra/ftp/client/client.factor b/extra/ftp/client/client.factor
index 642d2ce8cd..9b9a2214c1 100644
--- a/extra/ftp/client/client.factor
+++ b/extra/ftp/client/client.factor
@@ -154,7 +154,7 @@ GENERIC: ftp-download ( path obj -- )
 
 : with-ftp-client ( ftp-client quot -- )
     dupd '[
-        , [ ftp-login ] [ @ ] bi
+        _ [ ftp-login ] [ @ ] bi
         ftp-quit drop
     ] >r ftp-connect r> with-stream ; inline
 
diff --git a/extra/ftp/server/server.factor b/extra/ftp/server/server.factor
index 21a32d1776..3ecf8d2f3f 100644
--- a/extra/ftp/server/server.factor
+++ b/extra/ftp/server/server.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.short-circuit accessors combinators io io.encodings.8-bit
-io.encodings io.encodings.binary io.encodings.utf8 io.files
-io.sockets kernel math.parser namespaces sequences
-ftp io.unix.launcher.parser unicode.case splitting assocs
-classes io.servers.connection destructors calendar io.timeouts
-io.streams.duplex threads continuations math
-concurrency.promises byte-arrays ;
+USING: combinators.short-circuit accessors combinators io
+io.encodings.8-bit io.encodings io.encodings.binary
+io.encodings.utf8 io.files io.sockets kernel math.parser
+namespaces make sequences ftp io.unix.launcher.parser
+unicode.case splitting assocs classes io.servers.connection
+destructors calendar io.timeouts io.streams.duplex threads
+continuations math concurrency.promises byte-arrays ;
 IN: ftp.server
 
 SYMBOL: client
diff --git a/extra/graph-theory/graph-theory.factor b/extra/graph-theory/graph-theory.factor
index 322f17d2dd..842f4d1f38 100644
--- a/extra/graph-theory/graph-theory.factor
+++ b/extra/graph-theory/graph-theory.factor
@@ -35,10 +35,10 @@ M: graph num-vertices
     vertices length ;
 
 M: graph num-edges
-   [ vertices ] [ '[ , adjlist length ] map sum ] bi ;
+   [ vertices ] [ '[ _ adjlist length ] map sum ] bi ;
 
 M: graph adjlist
-    [ vertices ] [ swapd '[ , swap , adj? ] filter ] bi ;
+    [ vertices ] [ swapd '[ _ swap _ adj? ] filter ] bi ;
 
 M: graph adj?
     swapd adjlist index >boolean ;
@@ -50,11 +50,11 @@ M: graph delete-edge
     [ delete-edge* ] [ swapd delete-edge* ] 3bi ;
 
 : add-blank-vertices ( seq graph -- )
-    '[ , add-blank-vertex ] each ;
+    '[ _ add-blank-vertex ] each ;
 
 : delete-vertex ( index graph -- )
     [ adjlist ]
-    [ '[ , , 3dup adj? [ delete-edge* ] [ 3drop ] if ] each ]
+    [ '[ _ _ 3dup adj? [ delete-edge* ] [ 3drop ] if ] each ]
     [ delete-blank-vertex ] 2tri ;
 
 <PRIVATE
@@ -67,22 +67,22 @@ M: graph delete-edge
     { [ 2drop visited? get t -rot set-at ] 
       [ drop call ]
       [ [ graph get adjlist ] 2dip
-        '[ dup visited? get at [ drop ] [ , , (depth-first) ] if ] each ]
+        '[ dup visited? get at [ drop ] [ _ _ (depth-first) ] if ] each ]
       [ nip call ] } 3cleave ; inline
 
 PRIVATE>
 
 : depth-first ( v graph pre post -- ?list ? )
-    '[ , , (depth-first) visited? get ] swap search-wrap ; inline
+    '[ _ _ (depth-first) visited? get ] swap search-wrap ; inline
 
 : full-depth-first ( graph pre post tail -- ? )
     '[ [ visited? get [ nip not ] assoc-find ] 
-       [ drop , , (depth-first) @ ] 
+       [ drop _ _ (depth-first) @ ] 
        [ 2drop ] while ] swap search-wrap ; inline
 
 : dag? ( graph -- ? )
     V{ } clone swap [ 2dup swap push dupd
-                     '[ , swap graph get adj? not ] all? 
+                     '[ _ swap graph get adj? not ] all? 
                       [ end-search ] unless ]
                     [ drop dup pop* ] [ ] full-depth-first nip ;
 
diff --git a/extra/graph-theory/sparse/sparse.factor b/extra/graph-theory/sparse/sparse.factor
index 33c5505f0a..5c6365b563 100644
--- a/extra/graph-theory/sparse/sparse.factor
+++ b/extra/graph-theory/sparse/sparse.factor
@@ -12,7 +12,7 @@ TUPLE: sparse-graph alist ;
 
 : >sparse-graph ( graph -- sparse-graph )
     [ vertices ] keep
-    '[ dup , adjlist 2array ] map >hashtable sparse-graph boa ;
+    '[ dup _ adjlist 2array ] map >hashtable sparse-graph boa ;
 
 INSTANCE: sparse-graph graph
 
diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor
index 29ccc345d3..b82b5662dc 100755
--- a/extra/html/parser/analyzer/analyzer.factor
+++ b/extra/html/parser/analyzer/analyzer.factor
@@ -1,6 +1,7 @@
 USING: assocs html.parser kernel math sequences strings ascii
-arrays generalizations shuffle unicode.case namespaces splitting
-http sequences.lib accessors io combinators http.client urls ;
+arrays generalizations shuffle unicode.case namespaces make
+splitting http sequences.lib accessors io combinators
+http.client urls ;
 IN: html.parser.analyzer
 
 TUPLE: link attributes clickable ;
diff --git a/extra/html/parser/parser.factor b/extra/html/parser/parser.factor
index ccd225e6e0..95bfa938a2 100644
--- a/extra/html/parser/parser.factor
+++ b/extra/html/parser/parser.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays html.parser.utils hashtables io kernel
-namespaces prettyprint quotations
-sequences splitting state-parser strings unicode.categories unicode.case
+namespaces make prettyprint quotations sequences splitting
+state-parser strings unicode.categories unicode.case
 sequences.lib ;
 IN: html.parser
 
diff --git a/extra/inverse/inverse.factor b/extra/inverse/inverse.factor
index b843c73983..7f55b609e3 100755
--- a/extra/inverse/inverse.factor
+++ b/extra/inverse/inverse.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel words summary slots quotations
 sequences assocs math arrays stack-checker effects generalizations
-continuations debugger classes.tuple namespaces vectors
+continuations debugger classes.tuple namespaces make vectors
 bit-arrays byte-arrays strings sbufs math.functions macros
 sequences.private combinators mirrors
 combinators.short-circuit ;
diff --git a/extra/irc/client/client.factor b/extra/irc/client/client.factor
index 575c26972f..2474fd643a 100644
--- a/extra/irc/client/client.factor
+++ b/extra/irc/client/client.factor
@@ -334,7 +334,7 @@ DEFER: (connect-irc)
 
 : set+run-listener ( name irc-listener -- )
     over irc> listeners>> set-at
-    '[ , listener-loop ] "listener" spawn-irc-loop ;
+    '[ _ listener-loop ] "listener" spawn-irc-loop ;
 
 GENERIC: (add-listener) ( irc-listener -- )
 
@@ -342,7 +342,7 @@ M: irc-channel-listener (add-listener) ( irc-channel-listener -- )
     [ [ name>> ] [ password>> ] bi /JOIN ]
     [ [ [ drop irc> join-messages>> ]
         [ timeout>> ]
-        [ name>> '[ trailing>> , = ] ]
+        [ name>> '[ trailing>> _ = ] ]
         tri mailbox-get-timeout? trailing>> ] keep set+run-listener
     ] bi ;
 
@@ -382,10 +382,10 @@ PRIVATE>
       spawn-irc ] with-irc-client ;
 
 : add-listener ( irc-listener irc-client -- )
-    swap '[ , (add-listener) ] with-irc-client ;
+    swap '[ _ (add-listener) ] with-irc-client ;
 
 : remove-listener ( irc-listener irc-client -- )
-    swap '[ , (remove-listener) ] with-irc-client ;
+    swap '[ _ (remove-listener) ] with-irc-client ;
 
 : write-message ( message irc-listener -- ) out-messages>> mailbox-put ;
 : read-message ( irc-listener -- message ) in-messages>> mailbox-get ;
diff --git a/extra/irc/messages/messages.factor b/extra/irc/messages/messages.factor
index d3eca92f15..16066199ed 100755
--- a/extra/irc/messages/messages.factor
+++ b/extra/irc/messages/messages.factor
@@ -77,7 +77,7 @@ M: irc-message irc-message>server-line ( irc-message -- string )
 ! ======================================
 
 : split-at-first ( seq separators -- before after )
-    dupd '[ , member? ] find
+    dupd '[ _ member? ] find
         [ cut 1 tail ]
         [ swap ]
     if ;
@@ -127,4 +127,4 @@ M: sender-in-prefix irc-message-sender ( sender-in-prefix -- sender )
     } case
     [ [ tuple-slots ] [ parameters>> ] bi append ] dip
     [ all-slots over [ length ] bi@ min head >quotation ] keep
-    '[ @ , boa ] call ;
+    '[ @ _ boa ] call ;
diff --git a/extra/irc/ui/ui.factor b/extra/irc/ui/ui.factor
index 457a984820..1e4bcf35f8 100755
--- a/extra/irc/ui/ui.factor
+++ b/extra/irc/ui/ui.factor
@@ -140,17 +140,17 @@ M: object time-happened drop now ;
 GENERIC: handle-inbox ( tab message -- )
 
 : value-labels ( assoc val -- seq )
-    '[ nip , = ] assoc-filter keys sort-strings [ <label> ] map ;
+    '[ nip _ = ] assoc-filter keys sort-strings [ <label> ] map ;
 
 : add-gadget-color ( pack seq color -- pack )
-    '[ , >>color add-gadget ] each ;
+    '[ _ >>color add-gadget ] each ;
 
 M: object handle-inbox
     nip print-irc ;
 
 : display ( stream tab -- )
-    '[ , [ [ t ]
-           [ , dup listener>> read-message handle-inbox ]
+    '[ _ [ [ t ]
+           [ _ dup listener>> read-message handle-inbox ]
            [  ] while ] with-output-stream ] "ircv" spawn drop ;
 
 : <irc-pane> ( tab -- tab pane )
@@ -168,7 +168,7 @@ TUPLE: irc-editor < editor outstream tab ;
       [ [ irc-tab? ] find-parent ]
       [ editor-string ]
       [ "" swap set-editor-string ] } cleave
-     '[ , irc-tab set , parse-message ] with-output-stream ;
+     '[ _ irc-tab set _ parse-message ] with-output-stream ;
 
 irc-editor "general" f {
     { T{ key-down f f "RET" } editor-send }
diff --git a/extra/joystick-demo/joystick-demo.factor b/extra/joystick-demo/joystick-demo.factor
index b5289dbcbf..6a0b9f728f 100755
--- a/extra/joystick-demo/joystick-demo.factor
+++ b/extra/joystick-demo/joystick-demo.factor
@@ -125,7 +125,7 @@ TUPLE: joystick-demo-gadget < pack axis raxis controller buttons alarm ;
     [ (update-axes) ] [ kill-update-axes ] if* ;
 
 M: joystick-demo-gadget graft*
-    dup '[ , update-axes ] FREQUENCY every >>alarm
+    dup '[ _ update-axes ] FREQUENCY every >>alarm
     drop ;
 
 M: joystick-demo-gadget ungraft*
diff --git a/extra/key-caps/key-caps.factor b/extra/key-caps/key-caps.factor
index e14a46a967..0865b0ada2 100755
--- a/extra/key-caps/key-caps.factor
+++ b/extra/key-caps/key-caps.factor
@@ -162,7 +162,7 @@ M: key-caps-gadget pref-dim* drop KEYBOARD-SIZE ;
     relayout-1 ;
 
 M: key-caps-gadget graft*
-    dup '[ , update-key-caps-state ] FREQUENCY every >>alarm
+    dup '[ _ update-key-caps-state ] FREQUENCY every >>alarm
     drop ;
 
 M: key-caps-gadget ungraft*
diff --git a/extra/lisp/lisp.factor b/extra/lisp/lisp.factor
index e004af8655..2866e63c69 100644
--- a/extra/lisp/lisp.factor
+++ b/extra/lisp/lisp.factor
@@ -21,16 +21,16 @@ DEFER: define-lisp-macro
 
 : convert-cond ( cons -- quot )
     cdr [ 2car [ convert-form ] bi@ 2array ]
-    { } lmap-as '[ , cond ] ;
+    { } lmap-as '[ _ cond ] ;
 
 : convert-general-form ( cons -- quot )
-    uncons [ convert-body ] [ convert-form ] bi* '[ , @ funcall ] ;
+    uncons [ convert-body ] [ convert-form ] bi* '[ _ @ funcall ] ;
 
 ! words for convert-lambda
 <PRIVATE
 : localize-body ( assoc body -- newbody )
     {
-      { [ dup list? ] [ [ lisp-symbol? ] rot '[ [ name>> , at ] [ ] bi or ] traverse ] }
+      { [ dup list? ] [ [ lisp-symbol? ] rot '[ [ name>> _ at ] [ ] bi or ] traverse ] }
       { [ dup lisp-symbol? ] [ name>> swap at ] }
      [ nip ]
     } cond ;
@@ -46,7 +46,7 @@ DEFER: define-lisp-macro
 : rest-lambda ( body vars -- quot )
     "&rest" swap [ remove ] [ index ] 2bi
     [ localize-lambda <lambda> lambda-rewrite call ] dip
-    swap '[ , cut '[ @ , seq>list ] call , call call ] 1quotation ;
+    swap '[ _ cut '[ @ _ seq>list ] call _ call call ] 1quotation ;
 
 : normal-lambda ( body vars -- quot )
     localize-lambda <lambda> lambda-rewrite '[ @ compose call call ] 1quotation ;
@@ -74,7 +74,7 @@ PRIVATE>
 
 : convert-begin ( cons -- quot )
     cdr [ convert-form ] [ ] lmap-as [ 1 tail* ] [ but-last ] bi
-    [ '[ { } , with-datastack drop ] ] map prepend '[ , [ call ] each ] ;
+    [ '[ { } _ with-datastack drop ] ] map prepend '[ _ [ call ] each ] ;
 
 : form-dispatch ( cons lisp-symbol -- quot )
     name>>
@@ -97,7 +97,7 @@ PRIVATE>
     {
       { [ dup cons? ] [ convert-list-form ] }
       { [ dup lisp-var? ] [ lookup-var 1quotation ] }
-      { [ dup lisp-symbol? ] [ '[ , lookup-var ] ] }
+      { [ dup lisp-symbol? ] [ '[ _ lookup-var ] ] }
      [ 1quotation ]
     } cond ;
 
@@ -138,7 +138,7 @@ M: no-such-var summary drop "No such variable" ;
     [ 1array [ call ] with-datastack >quotation ] dip curry call ; inline
 
 : define-primitive ( name vocab word -- )
-    swap lookup 1quotation '[ , compose call ] swap lisp-define ;
+    swap lookup 1quotation '[ _ compose call ] swap lisp-define ;
 
 : lookup-macro ( lisp-symbol -- lambda )
     name>> macro-env get at ;
diff --git a/extra/lists/lazy/lazy.factor b/extra/lists/lazy/lazy.factor
index 5854e37702..e60fcbaadf 100644
--- a/extra/lists/lazy/lazy.factor
+++ b/extra/lists/lazy/lazy.factor
@@ -5,7 +5,7 @@
 ! Updated by Chris Double, September 2006
 ! Updated by James Cash, June 2008
 !
-USING: kernel sequences math vectors arrays namespaces
+USING: kernel sequences math vectors arrays namespaces make
 quotations promises combinators io lists accessors ;
 IN: lists.lazy
 
diff --git a/extra/math/blas/vectors/vectors.factor b/extra/math/blas/vectors/vectors.factor
index 87bc6437c3..a135f08f28 100755
--- a/extra/math/blas/vectors/vectors.factor
+++ b/extra/math/blas/vectors/vectors.factor
@@ -62,7 +62,7 @@ METHOD: (blas-vector-like) { object object object double-complex-blas-vector }
     1 ;
 
 MACRO: (do-copy) ( copy make-vector -- )
-    '[ over 6 npick , 2dip 1 @ ] ;
+    '[ over 6 npick _ 2dip 1 @ ] ;
 
 : (prepare-swap) ( v1 v2 -- length v1-data v1-inc v2-data v2-inc v1 v2 )
     [
@@ -105,7 +105,7 @@ MACRO: (do-copy) ( copy make-vector -- )
 MACRO: (complex-nth) ( nth-quot -- )
     '[ 
         [ 2 * dup 1+ ] dip
-        , curry bi@ rect>
+        _ curry bi@ rect>
     ] ;
 
 : (c-complex-nth) ( n alien -- complex )
@@ -120,7 +120,7 @@ MACRO: (set-complex-nth) ( set-nth-quot -- )
             [ 2 * dup 1+ ] bi*
             swapd
         ] dip
-        , curry 2bi@ 
+        _ curry 2bi@ 
     ] ;
 
 : (set-c-complex-nth) ( complex n alien -- )
diff --git a/extra/math/combinatorics/combinatorics.factor b/extra/math/combinatorics/combinatorics.factor
index 6193edfb91..7c5d5ba4c0 100644
--- a/extra/math/combinatorics/combinatorics.factor
+++ b/extra/math/combinatorics/combinatorics.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007, 2008 Slava Pestov, Doug Coleman, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel math math.order math.ranges mirrors
-namespaces sequences sequences.lib sorting ;
+namespaces make sequences sequences.lib sorting ;
 IN: math.combinatorics
 
 <PRIVATE
diff --git a/extra/math/numerical-integration/numerical-integration.factor b/extra/math/numerical-integration/numerical-integration.factor
index 163fc40c46..798d3a5e71 100644
--- a/extra/math/numerical-integration/numerical-integration.factor
+++ b/extra/math/numerical-integration/numerical-integration.factor
@@ -1,4 +1,4 @@
-USING: arrays kernel sequences namespaces math math.ranges
+USING: arrays kernel sequences namespaces make math math.ranges
 math.vectors vectors ;
 IN: math.numerical-integration
 
diff --git a/extra/math/polynomials/polynomials.factor b/extra/math/polynomials/polynomials.factor
index 018b041afd..8662bbb089 100644
--- a/extra/math/polynomials/polynomials.factor
+++ b/extra/math/polynomials/polynomials.factor
@@ -1,5 +1,5 @@
-USING: arrays kernel sequences vectors math math.vectors namespaces
-shuffle splitting sequences.lib math.order ;
+USING: arrays kernel sequences vectors math math.vectors
+namespaces make shuffle splitting sequences.lib math.order ;
 IN: math.polynomials
 
 ! Polynomials are vectors with the highest powers on the right:
diff --git a/extra/math/primes/factors/factors.factor b/extra/math/primes/factors/factors.factor
index 83d53c4215..059bd67c18 100644
--- a/extra/math/primes/factors/factors.factor
+++ b/extra/math/primes/factors/factors.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2007 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel lists math math.primes namespaces sequences ;
+USING: arrays kernel lists math math.primes namespaces make
+sequences ;
 IN: math.primes.factors
 
 <PRIVATE
diff --git a/extra/monads/monads.factor b/extra/monads/monads.factor
index e110cb38d3..e9ae167532 100644
--- a/extra/monads/monads.factor
+++ b/extra/monads/monads.factor
@@ -22,7 +22,7 @@ M: monad return monad-of return ;
 M: monad fail   monad-of fail   ;
 
 : bind ( mvalue quot -- mvalue' ) swap >>= call ;
-: >>   ( mvalue k -- mvalue' ) '[ drop , ] bind ;
+: >>   ( mvalue k -- mvalue' ) '[ drop _ ] bind ;
 
 :: lift-m2 ( m1 m2 f monad -- m3 )
     m1 [| x1 | m2 [| x2 | x1 x2 f monad return ] bind ] bind ;
@@ -34,7 +34,7 @@ M: monad fail   monad-of fail   ;
         ] bind
     ] bind ;
 
-M: monad fmap over '[ @ , return ] bind ;
+M: monad fmap over '[ @ _ return ] bind ;
 
 ! 'do' notation
 : do ( quots -- result ) unclip dip [ bind ] each ;
@@ -51,7 +51,7 @@ M: identity monad-of drop identity-monad ;
 M: identity-monad return drop identity boa ;
 M: identity-monad fail   "Fail" throw ;
 
-M: identity >>= value>> '[ , _ call ] ;
+M: identity >>= value>> '[ _ swap call ] ;
 
 : run-identity ( identity -- value ) value>> ;
 
@@ -72,8 +72,8 @@ M: maybe monad-of drop maybe-monad ;
 M: maybe-monad return drop just ;
 M: maybe-monad fail   2drop nothing ;
 
-M: nothing >>= '[ drop , ] ;
-M: just    >>= value>> '[ , _ call ] ;
+M: nothing >>= '[ drop _ ] ;
+M: just    >>= value>> '[ _ swap call ] ;
 
 : if-maybe ( maybe just-quot nothing-quot -- )
     pick nothing? [ 2nip call ] [ drop [ value>> ] dip call ] if ; inline
@@ -96,8 +96,8 @@ M: either monad-of drop either-monad ;
 M: either-monad return  drop right ;
 M: either-monad fail    drop left ;
 
-M: left  >>= '[ drop , ] ;
-M: right >>= value>> '[ , _ call ] ;
+M: left  >>= '[ drop _ ] ;
+M: right >>= value>> '[ _ swap call ] ;
 
 : if-either ( value left-quot right-quot -- )
     [ [ value>> ] [ left? ] bi ] 2dip if ; inline
@@ -112,7 +112,7 @@ M: array-monad fail   2drop { } ;
 
 M: array monad-of drop array-monad ;
 
-M: array >>= '[ , _ map concat ] ;
+M: array >>= '[ _ swap map concat ] ;
 
 ! List
 SINGLETON: list-monad
@@ -124,7 +124,7 @@ M: list-monad fail   2drop nil ;
 
 M: list monad-of drop list-monad ;
 
-M: list >>= '[ , _ lazy-map lconcat ] ;
+M: list >>= '[ _ swap lazy-map lconcat ] ;
 
 ! State
 SINGLETON: state-monad
@@ -137,15 +137,15 @@ INSTANCE: state monad
 
 M: state monad-of drop state-monad ;
 
-M: state-monad return drop '[ , 2array ] state ;
+M: state-monad return drop '[ _ 2array ] state ;
 M: state-monad fail   "Fail" throw ;
 
 : mcall ( state -- ) quot>> call ;
 
-M: state >>= '[ , _ '[ , mcall first2 @ mcall ] state ] ;
+M: state >>= '[ _ swap '[ _ mcall first2 @ mcall ] state ] ;
 
 : get-st ( -- state ) [ dup 2array ] state ;
-: put-st ( value -- state ) '[ drop , f 2array ] state ;
+: put-st ( value -- state ) '[ drop _ f 2array ] state ;
 
 : run-st ( state initial -- ) swap mcall second ;
 
@@ -161,15 +161,15 @@ INSTANCE: reader monad
 
 M: reader monad-of drop reader-monad ;
 
-M: reader-monad return drop '[ drop , ] reader ;
+M: reader-monad return drop '[ drop _ ] reader ;
 M: reader-monad fail   "Fail" throw ;
 
-M: reader >>= '[ , _ '[ dup , mcall @ mcall ] reader ] ;
+M: reader >>= '[ _ swap '[ dup _ mcall @ mcall ] reader ] ;
 
 : run-reader ( reader env -- ) swap mcall ;
 
 : ask ( -- reader ) [ ] reader ;
-: local ( reader quot -- reader' ) swap '[ @ , mcall ] reader ;
+: local ( reader quot -- reader' ) swap '[ @ _ mcall ] reader ;
 
 ! Writer
 SINGLETON: writer-monad
@@ -185,7 +185,7 @@ M: writer-monad fail   "Fail" throw ;
 
 : run-writer ( writer -- value log ) [ value>> ] [ log>> ] bi ;
 
-M: writer >>= '[ , run-writer _ '[ @ run-writer ] dip append writer ] ;
+M: writer >>= '[ [ _ run-writer ] dip '[ @ run-writer ] dip append writer ] ;
 
 : pass ( writer -- writer' ) run-writer [ first2 ] dip swap call writer ;
 : listen ( writer -- writer' ) run-writer [ 2array ] keep writer ;
diff --git a/extra/money/money.factor b/extra/money/money.factor
index fb743e15af..76bc2bae18 100644
--- a/extra/money/money.factor
+++ b/extra/money/money.factor
@@ -1,5 +1,5 @@
 USING: io kernel math math.functions math.parser parser lexer
-namespaces sequences splitting grouping combinators
+namespaces make sequences splitting grouping combinators
 continuations sequences.lib ;
 IN: money
 
diff --git a/extra/morse/morse.factor b/extra/morse/morse.factor
index 4cce93a5a1..2951c96077 100644
--- a/extra/morse/morse.factor
+++ b/extra/morse/morse.factor
@@ -1,6 +1,8 @@
 ! Copyright (C) 2007, 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators hashtables kernel lists math namespaces openal parser-combinators promises sequences strings symbols synth synth.buffers unicode.case ;
+USING: accessors assocs combinators hashtables kernel lists math
+namespaces make openal parser-combinators promises sequences
+strings symbols synth synth.buffers unicode.case ;
 IN: morse
 
 <PRIVATE
diff --git a/extra/multi-methods/multi-methods.factor b/extra/multi-methods/multi-methods.factor
index a8025828f1..682abf3a5d 100755
--- a/extra/multi-methods/multi-methods.factor
+++ b/extra/multi-methods/multi-methods.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math sequences vectors classes classes.algebra
-combinators arrays words assocs parser namespaces definitions
-prettyprint prettyprint.backend quotations generalizations
-debugger io compiler.units kernel.private effects accessors
-hashtables sorting shuffle math.order sets ;
+combinators arrays words assocs parser namespaces make
+definitions prettyprint prettyprint.backend quotations
+generalizations debugger io compiler.units kernel.private
+effects accessors hashtables sorting shuffle math.order sets ;
 IN: multi-methods
 
 ! PART I: Converting hook specializers
diff --git a/extra/nehe/4/4.factor b/extra/nehe/4/4.factor
index 0bbd4d593f..5a7988c934 100644
--- a/extra/nehe/4/4.factor
+++ b/extra/nehe/4/4.factor
@@ -65,7 +65,7 @@ M: nehe4-gadget draw-gadget* ( gadget -- )
 
 M: nehe4-gadget graft* ( gadget -- )
   f >>quit?
-  [ nehe4-update-thread ] in-thread drop ;
+  [ nehe4-update-thread ] curry in-thread ;
 
 M: nehe4-gadget ungraft* ( gadget -- )
   t >>quit? drop ;
diff --git a/extra/nehe/5/5.factor b/extra/nehe/5/5.factor
index 1a416c9d95..deaba97c7c 100755
--- a/extra/nehe/5/5.factor
+++ b/extra/nehe/5/5.factor
@@ -117,7 +117,7 @@ M: nehe5-gadget draw-gadget* ( gadget -- )
 
 M: nehe5-gadget graft* ( gadget -- )
   f >>quit?
-  [ nehe5-update-thread ] in-thread drop ;
+  [ nehe5-update-thread ] curry in-thread ;
 
 M: nehe5-gadget ungraft* ( gadget -- )
   t >>quit? drop ;
diff --git a/extra/odbc/odbc.factor b/extra/odbc/odbc.factor
index faa6c48354..267c7be312 100644
--- a/extra/odbc/odbc.factor
+++ b/extra/odbc/odbc.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel alien alien.strings alien.syntax
-combinators alien.c-types strings sequences namespaces words
-math threads io.encodings.ascii ;
+combinators alien.c-types strings sequences namespaces make
+words math threads io.encodings.ascii ;
 IN: odbc
 
 << "odbc" "odbc32.dll" "stdcall" add-library >>
diff --git a/extra/opengl/capabilities/capabilities.factor b/extra/opengl/capabilities/capabilities.factor
index 806935d5c9..3972fea7b3 100755
--- a/extra/opengl/capabilities/capabilities.factor
+++ b/extra/opengl/capabilities/capabilities.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces sequences splitting opengl.gl
+USING: kernel namespaces make sequences splitting opengl.gl
 continuations math.parser math arrays sets math.order ;
 IN: opengl.capabilities
 
diff --git a/extra/ori/ori.factor b/extra/ori/ori.factor
index de720a229f..84d33bb77f 100644
--- a/extra/ori/ori.factor
+++ b/extra/ori/ori.factor
@@ -1,5 +1,5 @@
 
-USING: kernel namespaces accessors
+USING: kernel namespaces make accessors
        math math.constants math.functions math.matrices math.vectors
        sequences splitting grouping self math.trig ;
 
diff --git a/extra/pack/pack-tests.factor b/extra/pack/pack-tests.factor
index d58ccbd0f2..b1a354cd4e 100755
--- a/extra/pack/pack-tests.factor
+++ b/extra/pack/pack-tests.factor
@@ -1,4 +1,5 @@
-USING: io io.streams.string kernel namespaces pack strings tools.test ;
+USING: io io.streams.string kernel namespaces make
+pack strings tools.test ;
 
 [ B{ 1 0 2 0 0 3 0 0 0 4 0 0 0 0 0 0 0 5 } ] [
     { 1 2 3 4 5 }
diff --git a/extra/pack/pack.factor b/extra/pack/pack.factor
index a5d4b36c0b..889eecb49a 100755
--- a/extra/pack/pack.factor
+++ b/extra/pack/pack.factor
@@ -1,7 +1,7 @@
 USING: alien alien.c-types arrays assocs byte-arrays io
 io.binary io.streams.string kernel math math.parser namespaces
-parser prettyprint quotations sequences strings vectors words
-macros math.functions math.bitwise ;
+make parser prettyprint quotations sequences strings vectors
+words macros math.functions math.bitwise ;
 IN: pack
 
 SYMBOL: big-endian
diff --git a/extra/processing/processing.factor b/extra/processing/processing.factor
index 07b92fa8fd..f351c989f0 100644
--- a/extra/processing/processing.factor
+++ b/extra/processing/processing.factor
@@ -8,7 +8,7 @@ USING: kernel namespaces threads combinators sequences arrays
        combinators
        combinators.lib
        combinators.cleave
-       rewrite-closures fry accessors newfx
+       rewrite-closures bake bake.fry accessors newfx
        processing.gadget math.geometry.rect
        processing.shapes
        colors ;
diff --git a/extra/project-euler/009/009.factor b/extra/project-euler/009/009.factor
index 690fed9012..c1a4a16918 100644
--- a/extra/project-euler/009/009.factor
+++ b/extra/project-euler/009/009.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.functions namespaces sequences sorting ;
+USING: kernel math math.functions namespaces make sequences sorting ;
 IN: project-euler.009
 
 ! http://projecteuler.net/index.php?section=problems&id=9
diff --git a/extra/project-euler/011/011.factor b/extra/project-euler/011/011.factor
index a55c3ac124..f4e549c7c0 100644
--- a/extra/project-euler/011/011.factor
+++ b/extra/project-euler/011/011.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces project-euler.common sequences
+USING: kernel namespaces make project-euler.common sequences
 splitting grouping ;
 IN: project-euler.011
 
diff --git a/extra/project-euler/014/014.factor b/extra/project-euler/014/014.factor
index 4f17e855b7..fcbc956de8 100644
--- a/extra/project-euler/014/014.factor
+++ b/extra/project-euler/014/014.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators.lib combinators.short-circuit kernel math math.ranges
-    namespaces sequences sorting ;
+USING: arrays combinators.lib combinators.short-circuit kernel
+math math.ranges namespaces make sequences sorting ;
 IN: project-euler.014
 
 ! http://projecteuler.net/index.php?section=problems&id=14
diff --git a/extra/project-euler/042/042.factor b/extra/project-euler/042/042.factor
index 4111fe8009..da26e34927 100644
--- a/extra/project-euler/042/042.factor
+++ b/extra/project-euler/042/042.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: ascii io.files kernel math math.functions namespaces
+USING: ascii io.files kernel math math.functions namespaces make
     project-euler.common sequences sequences.lib splitting io.encodings.ascii ;
 IN: project-euler.042
 
diff --git a/extra/project-euler/059/059.factor b/extra/project-euler/059/059.factor
index aa2cdb75b0..f209b50a46 100644
--- a/extra/project-euler/059/059.factor
+++ b/extra/project-euler/059/059.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays ascii assocs hashtables io.encodings.ascii io.files kernel math
-    math.parser namespaces sequences sequences.lib sequences.private sorting
+    math.parser namespaces make sequences sequences.lib sequences.private sorting
     splitting grouping strings sets accessors ;
 IN: project-euler.059
 
diff --git a/extra/project-euler/079/079.factor b/extra/project-euler/079/079.factor
index 1e6a2fb0b4..99c70ba038 100644
--- a/extra/project-euler/079/079.factor
+++ b/extra/project-euler/079/079.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs hashtables io.files kernel math math.parser namespaces
-io.encodings.ascii sequences sets ;
+USING: assocs hashtables io.files kernel math math.parser
+namespaces make io.encodings.ascii sequences sets ;
 IN: project-euler.079
 
 ! http://projecteuler.net/index.php?section=problems&id=79
diff --git a/extra/project-euler/ave-time/ave-time.factor b/extra/project-euler/ave-time/ave-time.factor
index be39b26a97..df96d5e211 100644
--- a/extra/project-euler/ave-time/ave-time.factor
+++ b/extra/project-euler/ave-time/ave-time.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations io kernel math math.functions math.parser math.statistics
-    namespaces tools.time ;
+    namespaces make tools.time ;
 IN: project-euler.ave-time
 
 : collect-benchmarks ( quot n -- seq )
diff --git a/extra/project-euler/common/common.factor b/extra/project-euler/common/common.factor
index 7963cde254..094893616b 100644
--- a/extra/project-euler/common/common.factor
+++ b/extra/project-euler/common/common.factor
@@ -1,6 +1,7 @@
-USING: arrays kernel math math.functions math.miller-rabin math.matrices
-    math.order math.parser math.primes.factors math.ranges namespaces
-    sequences sequences.lib sorting unicode.case ;
+USING: arrays kernel math math.functions math.miller-rabin
+math.matrices math.order math.parser math.primes.factors
+math.ranges namespaces make sequences sequences.lib sorting
+unicode.case ;
 IN: project-euler.common
 
 ! A collection of words used by more than one Project Euler solution
diff --git a/extra/promises/promises.factor b/extra/promises/promises.factor
index 5d63406e78..38366697ea 100755
--- a/extra/promises/promises.factor
+++ b/extra/promises/promises.factor
@@ -5,7 +5,7 @@
 ! Updated by Chris Double, September 2006
 
 USING: arrays kernel sequences math vectors arrays namespaces
-quotations parser effects stack-checker words accessors ;
+make quotations parser effects stack-checker words accessors ;
 IN: promises
 
 TUPLE: promise quot forced? value ;
diff --git a/extra/random-weighted/random-weighted.factor b/extra/random-weighted/random-weighted.factor
index 3f7a5d09b5..ce3bc311be 100644
--- a/extra/random-weighted/random-weighted.factor
+++ b/extra/random-weighted/random-weighted.factor
@@ -1,6 +1,6 @@
 
 USING: kernel namespaces arrays quotations sequences assocs combinators
-       mirrors math math.vectors random macros fry ;
+       mirrors math math.vectors random macros bake bake.fry ;
 
 IN: random-weighted
 
diff --git a/extra/random/blum-blum-shub/blum-blum-shub-tests.factor b/extra/random/blum-blum-shub/blum-blum-shub-tests.factor
index 9ace53ab25..4b0dee642e 100644
--- a/extra/random/blum-blum-shub/blum-blum-shub-tests.factor
+++ b/extra/random/blum-blum-shub/blum-blum-shub-tests.factor
@@ -11,14 +11,12 @@ IN: blum-blum-shub.tests
 [ 70576473 ] [
     T{ blum-blum-shub f 590695557939 811977232793 } clone [
         32 random-bits
-        little-endian? [ <uint> reverse *uint ] unless
     ] with-random
 ] unit-test
 
 [ 5570804936418322777 ] [
     T{ blum-blum-shub f 590695557939 811977232793 } clone [
         64 random-bits
-        little-endian? [ <ulonglong> 4 group [ reverse ] map concat *ulonglong ] unless
     ] with-random
 ] unit-test
 
diff --git a/extra/random/blum-blum-shub/blum-blum-shub.factor b/extra/random/blum-blum-shub/blum-blum-shub.factor
index e60990075c..8e9f0e2552 100755
--- a/extra/random/blum-blum-shub/blum-blum-shub.factor
+++ b/extra/random/blum-blum-shub/blum-blum-shub.factor
@@ -13,7 +13,7 @@ TUPLE: blum-blum-shub x n ;
     [ [ random-prime ] curry [ 4 mod 3 = ] generate ] dup bi ;
 
 : next-bbs-bit ( bbs -- bit )
-    [ [ x>> 2 ] [ n>> ] bi ^mod dup ] keep (>>x) 1 bitand ;
+    dup [ x>> 2 ] [ n>> ] bi ^mod [ >>x drop ] [ 1 bitand ] bi ;
 
 PRIVATE>
 
diff --git a/extra/regexp/regexp.factor b/extra/regexp/regexp.factor
index cd2d0790ab..5ef3eacc6c 100755
--- a/extra/regexp/regexp.factor
+++ b/extra/regexp/regexp.factor
@@ -2,8 +2,7 @@ USING: arrays combinators kernel lists math math.parser
 namespaces parser lexer parser-combinators parser-combinators.simple
 promises quotations sequences combinators.lib strings math.order
 assocs prettyprint.backend memoize unicode.case unicode.categories
-combinators.short-circuit accessors ;
-USE: io
+combinators.short-circuit accessors make io ;
 IN: regexp
 
 <PRIVATE
diff --git a/extra/rewrite-closures/rewrite-closures.factor b/extra/rewrite-closures/rewrite-closures.factor
index 198e1744bc..6d11c9d41c 100644
--- a/extra/rewrite-closures/rewrite-closures.factor
+++ b/extra/rewrite-closures/rewrite-closures.factor
@@ -1,5 +1,6 @@
 
-USING: kernel parser math quotations namespaces sequences macros fry ;
+USING: kernel parser math quotations namespaces sequences macros
+bake bake.fry ;
 
 IN: rewrite-closures
 
diff --git a/extra/roman/roman.factor b/extra/roman/roman.factor
index aefe86328d..dcadb865f9 100644
--- a/extra/roman/roman.factor
+++ b/extra/roman/roman.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays assocs kernel math math.order math.vectors namespaces
-quotations sequences sequences.lib sequences.private strings unicode.case ;
+USING: arrays assocs kernel math math.order math.vectors
+namespaces make quotations sequences sequences.lib
+sequences.private strings unicode.case ;
 IN: roman
 
 <PRIVATE
diff --git a/extra/sequences/lib/lib.factor b/extra/sequences/lib/lib.factor
index 225b3b7d9e..ba49b8ee9e 100755
--- a/extra/sequences/lib/lib.factor
+++ b/extra/sequences/lib/lib.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2007 Slava Pestov, Chris Double, Doug Coleman,
 !                    Eduardo Cavazos, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.lib kernel sequences math namespaces assocs 
-random sequences.private shuffle math.functions
-arrays math.parser math.private sorting strings ascii macros
-assocs.lib quotations hashtables math.order locals
-generalizations ;
+USING: combinators.lib kernel sequences math namespaces make
+assocs random sequences.private shuffle math.functions arrays
+math.parser math.private sorting strings ascii macros assocs.lib
+quotations hashtables math.order locals generalizations ;
 IN: sequences.lib
 
 : each-withn ( seq quot n -- ) nwith each ; inline
diff --git a/extra/state-machine/state-machine.factor b/extra/state-machine/state-machine.factor
index 6a785e91b7..37e12a6993 100755
--- a/extra/state-machine/state-machine.factor
+++ b/extra/state-machine/state-machine.factor
@@ -1,4 +1,4 @@
-USING: kernel parser lexer strings math namespaces
+USING: kernel parser lexer strings math namespaces make
 sequences words io arrays quotations debugger accessors
 sequences.private ;
 IN: state-machine
diff --git a/extra/state-tables/state-tables.factor b/extra/state-tables/state-tables.factor
index 9a04a5b74a..ecb258c163 100644
--- a/extra/state-tables/state-tables.factor
+++ b/extra/state-tables/state-tables.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces sequences vectors assocs accessors ;
+USING: kernel namespaces make sequences vectors assocs accessors ;
 IN: state-tables
 
 TUPLE: table rows columns start-state final-states ;
diff --git a/extra/synth/example/example.factor b/extra/synth/example/example.factor
index 3357c103ad..747cfb9c86 100644
--- a/extra/synth/example/example.factor
+++ b/extra/synth/example/example.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays kernel namespaces openal sequences synth synth.buffers ;
+USING: accessors arrays kernel namespaces make openal sequences
+synth synth.buffers ;
 IN: synth.example
 
 : play-sine-wave ( freq seconds sample-freq -- )
diff --git a/extra/ui/gadgets/tabs/tabs.factor b/extra/ui/gadgets/tabs/tabs.factor
index 50e2df2e9e..7e09d086c2 100755
--- a/extra/ui/gadgets/tabs/tabs.factor
+++ b/extra/ui/gadgets/tabs/tabs.factor
@@ -14,7 +14,7 @@ DEFER: (del-page)
 
 :: add-toggle ( model n name toggler -- )
   <frame>
-    n name toggler parent>> '[ , , , (del-page) ] "X" swap <bevel-button>
+    n name toggler parent>> '[ _ _ _ (del-page) ] "X" swap <bevel-button>
       @right grid-add
     n model name <toggle-button> @center grid-add
   toggler swap add-gadget drop ;
@@ -23,7 +23,7 @@ DEFER: (del-page)
      [ names>> ] [ model>> ] [ toggler>> ] tri
      [ clear-gadget ] keep
      [ [ length ] keep ] 2dip
-    '[ , _ _ , add-toggle ] 2each ;
+     '[ [ _ ] 2dip _ add-toggle ] 2each ;
 
 : refresh-book ( tabbed -- )
     model>> [ ] change-model ;
diff --git a/extra/ui/gadgets/tiling/tiling.factor b/extra/ui/gadgets/tiling/tiling.factor
index 2d096966af..cf6ea7f48e 100644
--- a/extra/ui/gadgets/tiling/tiling.factor
+++ b/extra/ui/gadgets/tiling/tiling.factor
@@ -1,7 +1,7 @@
 
 USING: kernel sequences math math.order
        ui.gadgets ui.gadgets.tracks ui.gestures
-       fry accessors ;
+       bake.fry accessors ;
 
 IN: ui.gadgets.tiling
 
@@ -93,7 +93,7 @@ TUPLE: tiling < track gadgets tiles first focused ;
 
 : exchanged! ( seq a b -- )
                    [ 0 max ] bi@
-  pick length 1 - '[ , min ] bi@
+  pick length 1 - '[ _ min ] bi@
   rot exchange ;
 
 : move-prev ( tiling -- tiling )
diff --git a/extra/webapps/counter/counter.factor b/extra/webapps/counter/counter.factor
index a14d6d9823..f3efb3868f 100644
--- a/extra/webapps/counter/counter.factor
+++ b/extra/webapps/counter/counter.factor
@@ -13,7 +13,7 @@ M: counter-app init-session* drop 0 count sset ;
 : <counter-action> ( quot -- action )
     <action>
         swap '[
-            count , schange
+            count _ schange
             URL" $counter-app" <redirect>
         ] >>submit ;
 
diff --git a/extra/webapps/ip/ip.factor b/extra/webapps/ip/ip.factor
new file mode 100644
index 0000000000..7124d4a5c4
--- /dev/null
+++ b/extra/webapps/ip/ip.factor
@@ -0,0 +1,16 @@
+! Copyright (C) 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors furnace.actions http.server.dispatchers
+html.forms io.servers.connection namespaces prettyprint ;
+IN: webapps.ip
+
+TUPLE: ip-app < dispatcher ;
+
+: <display-ip-action> ( -- action )
+    <page-action>
+        [ remote-address get host>> "ip" set-value ] >>init
+        { ip-app "ip" } >>template ;
+
+: <ip-app> ( -- dispatcher )
+    ip-app new-dispatcher
+        <display-ip-action> "" add-responder ;
diff --git a/extra/webapps/ip/ip.xml b/extra/webapps/ip/ip.xml
new file mode 100644
index 0000000000..c8529c27ce
--- /dev/null
+++ b/extra/webapps/ip/ip.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' ?>
+<t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
+<html>
+	<body>Your IP address is: <t:label t:name="ip" />
+	</body>
+</html>
+</t:chloe>
diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor
index 10e706598e..721529de27 100755
--- a/extra/webapps/planet/planet.factor
+++ b/extra/webapps/planet/planet.factor
@@ -96,7 +96,7 @@ posting "POSTINGS"
 
 : fetch-blogroll ( blogroll -- entries )
     [ [ feed-url>> fetch-feed ] parallel-map ] [ [ name>> ] map ] bi
-    [ '[ , <posting> ] map ] 2map concat ;
+    [ '[ _ <posting> ] map ] 2map concat ;
 
 : sort-entries ( entries -- entries' )
     [ [ date>> ] compare invert-comparison ] sort ;
@@ -201,4 +201,4 @@ posting "POSTINGS"
         { planet "planet-common" } >>template ;
 
 : start-update-task ( db params -- )
-    '[ , , [ update-cached-postings ] with-db ] 10 minutes every drop ;
+    '[ _ _ [ update-cached-postings ] with-db ] 10 minutes every drop ;
diff --git a/extra/webapps/wee-url/wee-url.factor b/extra/webapps/wee-url/wee-url.factor
index 27187c4352..e4a4a6a853 100644
--- a/extra/webapps/wee-url/wee-url.factor
+++ b/extra/webapps/wee-url/wee-url.factor
@@ -26,7 +26,7 @@ short-url "SHORT_URLS" {
     1 6 [a,b] random [ letter-bank random ] "" replicate-as ;
 
 : insert-short-url ( short-url -- short-url )
-    '[ , dup random-url >>short insert-tuple ] 10 retry ;
+    '[ _ dup random-url >>short insert-tuple ] 10 retry ;
 
 : shorten ( url -- short )
     short-url new swap >>url dup select-tuple
diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index 5f679be431..9d1ad15aa4 100644
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel hashtables calendar random assocs
-namespaces splitting sequences sorting math.order present
+namespaces make splitting sequences sorting math.order present
 io.files io.encodings.ascii
 syndication farkup
 html.components html.forms
@@ -93,18 +93,12 @@ M: revision feed-entry-url id>> revision-url ;
     <article> select-tuple
     dup [ revision>> <revision> select-tuple ] when ;
 
-: init-relative-link-prefix ( -- )
-    URL" $wiki/view/" adjust-url present relative-link-prefix set ;
-
 : <view-article-action> ( -- action )
     <action>
 
         "title" >>rest
 
-        [
-            validate-title
-            init-relative-link-prefix
-        ] >>init
+        [ validate-title ] >>init
 
         [
             "title" value dup latest-revision [
@@ -126,7 +120,6 @@ M: revision feed-entry-url id>> revision-url ;
             validate-integer-id
             "id" value <revision>
             select-tuple from-object
-            init-relative-link-prefix
         ] >>init
 
         { wiki "view" } >>template
diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index e37f7d4c3f..a35358ae6b 100644
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -74,20 +74,24 @@ SYMBOL: dh-file
     "noreply@concatenative.org" lost-password-from set-global
     "website@concatenative.org" insomniac-sender set-global
     "slava@factorcode.org" insomniac-recipients set-global
-    <factor-website> main-responder set-global
     init-factor-db ;
 
 : init-testing ( -- )
     "resource:basis/openssl/test/dh1024.pem" dh-file set-global
     "resource:basis/openssl/test/server.pem" key-file set-global
     "password" key-password set-global
-    common-configuration ;
+    common-configuration
+    <factor-website> main-responder set-global ;
+
+: no-www-prefix ( -- responder )
+    "http://concatenative.org" <permanent-redirect> <trivial-responder> ;
 
 : init-production ( -- )
-    f dh-file set-global
-    f key-password set-global
-    "/home/slava/cert/host.pem" key-file set-global
-    common-configuration ;
+    common-configuration
+    <vhost-dispatcher>
+        <factor-website> "concatenative.org" add-responder
+        no-www-prefix "www.concatenative.org" add-responder
+    main-responder set-global ;
 
 : <factor-secure-config> ( -- config )
     <secure-config>
diff --git a/extra/wordtimer/wordtimer.factor b/extra/wordtimer/wordtimer.factor
index 5dc65c661b..ae3ce22414 100644
--- a/extra/wordtimer/wordtimer.factor
+++ b/extra/wordtimer/wordtimer.factor
@@ -1,4 +1,6 @@
-USING: kernel sequences namespaces math assocs words arrays tools.annotations vocabs sorting prettyprint io micros math.statistics accessors ;
+USING: kernel sequences namespaces make math assocs words arrays
+tools.annotations vocabs sorting prettyprint io micros
+math.statistics accessors ;
 IN: wordtimer
 
 SYMBOL: *wordtimes*
diff --git a/extra/xml/syntax/syntax.factor b/extra/xml/syntax/syntax.factor
index 6b765461e5..91b31ec7e6 100644
--- a/extra/xml/syntax/syntax.factor
+++ b/extra/xml/syntax/syntax.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: lexer parser splitting kernel quotations namespaces
+USING: lexer parser splitting kernel quotations namespaces make
 sequences assocs sequences.lib xml.generator xml.utilities
 xml.data ;
 IN: xml.syntax
diff --git a/unfinished/compiler/alien/alien.factor b/unfinished/compiler/alien/alien.factor
new file mode 100644
index 0000000000..1d63a06057
--- /dev/null
+++ b/unfinished/compiler/alien/alien.factor
@@ -0,0 +1,46 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors kernel namespaces make math sequences layouts
+alien.c-types alien.structs compiler.backend ;
+IN: compiler.alien
+
+! Common utilities
+
+: large-struct? ( ctype -- ? )
+    dup c-struct? [
+        heap-size struct-small-enough? not
+    ] [ drop f ] if ;
+
+: alien-parameters ( params -- seq )
+    dup parameters>>
+    swap return>> large-struct? [ "void*" prefix ] when ;
+
+: alien-return ( params -- ctype )
+    return>> dup large-struct? [ drop "void" ] when ;
+
+: c-type-stack-align ( type -- align )
+    dup c-type-stack-align? [ c-type-align ] [ drop cell ] if ;
+
+: parameter-align ( n type -- n delta )
+    over >r c-type-stack-align align dup r> - ;
+
+: parameter-sizes ( types -- total offsets )
+    #! Compute stack frame locations.
+    [
+        0 [
+            [ parameter-align drop dup , ] keep stack-size +
+        ] reduce cell align
+    ] { } make ;
+
+: return-size ( ctype -- n )
+    #! Amount of space we reserve for a return value.
+    dup large-struct? [ heap-size ] [ drop 0 ] if ;
+
+: alien-stack-frame ( params -- n )
+    alien-parameters parameter-sizes drop ;
+    
+: alien-invoke-frame ( params -- n )
+    #! One cell is temporary storage, temp@
+    dup return>> return-size
+    swap alien-stack-frame +
+    cell + ;
diff --git a/unfinished/compiler/backend/alien/alien.factor b/unfinished/compiler/backend/alien/alien.factor
new file mode 100644
index 0000000000..0c5a6afb75
--- /dev/null
+++ b/unfinished/compiler/backend/alien/alien.factor
@@ -0,0 +1,281 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.backend.alien
+
+! #alien-invoke
+: set-stack-frame ( n -- )
+    dup [ frame-required ] when* \ stack-frame set ;
+
+: with-stack-frame ( n quot -- )
+    swap set-stack-frame
+    call
+    f set-stack-frame ; inline
+
+GENERIC: reg-size ( register-class -- n )
+
+M: int-regs reg-size drop cell ;
+
+M: single-float-regs reg-size drop 4 ;
+
+M: double-float-regs reg-size drop 8 ;
+
+GENERIC: reg-class-variable ( register-class -- symbol )
+
+M: reg-class reg-class-variable ;
+
+M: float-regs reg-class-variable drop float-regs ;
+
+GENERIC: inc-reg-class ( register-class -- )
+
+M: reg-class inc-reg-class
+    dup reg-class-variable inc
+    fp-shadows-int? [ reg-size stack-params +@ ] [ drop ] if ;
+
+M: float-regs inc-reg-class
+    dup call-next-method
+    fp-shadows-int? [ reg-size cell /i int-regs +@ ] [ drop ] if ;
+
+GENERIC: reg-class-full? ( class -- ? )
+
+M: stack-params reg-class-full? drop t ;
+
+M: object reg-class-full?
+    [ reg-class-variable get ] [ param-regs length ] bi >= ;
+
+: spill-param ( reg-class -- n reg-class )
+    stack-params get
+    >r reg-size stack-params +@ r>
+    stack-params ;
+
+: fastcall-param ( reg-class -- n reg-class )
+    [ reg-class-variable get ] [ inc-reg-class ] [ ] tri ;
+
+: alloc-parameter ( parameter -- reg reg-class )
+    c-type-reg-class dup reg-class-full?
+    [ spill-param ] [ fastcall-param ] if
+    [ param-reg ] keep ;
+
+: (flatten-int-type) ( size -- )
+    cell /i "void*" c-type <repetition> % ;
+
+GENERIC: flatten-value-type ( type -- )
+
+M: object flatten-value-type , ;
+
+M: struct-type flatten-value-type ( type -- )
+    stack-size cell align (flatten-int-type) ;
+
+M: long-long-type flatten-value-type ( type -- )
+    stack-size cell align (flatten-int-type) ;
+
+: flatten-value-types ( params -- params )
+    #! Convert value type structs to consecutive void*s.
+    [
+        0 [
+            c-type
+            [ parameter-align (flatten-int-type) ] keep
+            [ stack-size cell align + ] keep
+            flatten-value-type
+        ] reduce drop
+    ] { } make ;
+
+: each-parameter ( parameters quot -- )
+    >r [ parameter-sizes nip ] keep r> 2each ; inline
+
+: reverse-each-parameter ( parameters quot -- )
+    >r [ parameter-sizes nip ] keep r> 2reverse-each ; inline
+
+: reset-freg-counts ( -- )
+    { int-regs float-regs stack-params } [ 0 swap set ] each ;
+
+: with-param-regs ( quot -- )
+    #! In quot you can call alloc-parameter
+    [ reset-freg-counts call ] with-scope ; inline
+
+: move-parameters ( node word -- )
+    #! Moves values from C stack to registers (if word is
+    #! %load-param-reg) and registers to C stack (if word is
+    #! %save-param-reg).
+    >r
+    alien-parameters
+    flatten-value-types
+    r> [ >r alloc-parameter r> execute ] curry each-parameter ;
+    inline
+
+: unbox-parameters ( offset node -- )
+    parameters>> [
+        %prepare-unbox >r over + r> unbox-parameter
+    ] reverse-each-parameter drop ;
+
+: prepare-box-struct ( node -- offset )
+    #! Return offset on C stack where to store unboxed
+    #! parameters. If the C function is returning a structure,
+    #! the first parameter is an implicit target area pointer,
+    #! so we need to use a different offset.
+    return>> dup large-struct?
+    [ heap-size %prepare-box-struct cell ] [ drop 0 ] if ;
+
+: objects>registers ( params -- )
+    #! Generate code for unboxing a list of C types, then
+    #! generate code for moving these parameters to register on
+    #! architectures where parameters are passed in registers.
+    [
+        [ prepare-box-struct ] keep
+        [ unbox-parameters ] keep
+        \ %load-param-reg move-parameters
+    ] with-param-regs ;
+
+: box-return* ( node -- )
+    return>> [ ] [ box-return ] if-void ;
+
+TUPLE: no-such-library name ;
+
+M: no-such-library summary
+    drop "Library not found" ;
+
+M: no-such-library compiler-error-type
+    drop +linkage+ ;
+
+: no-such-library ( name -- )
+    \ no-such-library boa
+    compiling-word get compiler-error ;
+
+TUPLE: no-such-symbol name ;
+
+M: no-such-symbol summary
+    drop "Symbol not found" ;
+
+M: no-such-symbol compiler-error-type
+    drop +linkage+ ;
+
+: no-such-symbol ( name -- )
+    \ no-such-symbol boa
+    compiling-word get compiler-error ;
+
+: check-dlsym ( symbols dll -- )
+    dup dll-valid? [
+        dupd [ dlsym ] curry contains?
+        [ drop ] [ no-such-symbol ] if
+    ] [
+        dll-path no-such-library drop
+    ] if ;
+
+: stdcall-mangle ( symbol node -- symbol )
+    "@"
+    swap parameters>> parameter-sizes drop
+    number>string 3append ;
+
+: alien-invoke-dlsym ( params -- symbols dll )
+    dup function>> dup pick stdcall-mangle 2array
+    swap library>> library dup [ dll>> ] when
+    2dup check-dlsym ;
+
+M: #alien-invoke generate-node
+    params>>
+    dup alien-invoke-frame [
+        end-basic-block
+        %prepare-alien-invoke
+        dup objects>registers
+        %prepare-var-args
+        dup alien-invoke-dlsym %alien-invoke
+        dup %cleanup
+        box-return*
+        iterate-next
+    ] with-stack-frame ;
+
+! #alien-indirect
+M: #alien-indirect generate-node
+    params>>
+    dup alien-invoke-frame [
+        ! Flush registers
+        end-basic-block
+        ! Save registers for GC
+        %prepare-alien-invoke
+        ! Save alien at top of stack to temporary storage
+        %prepare-alien-indirect
+        dup objects>registers
+        %prepare-var-args
+        ! Call alien in temporary storage
+        %alien-indirect
+        dup %cleanup
+        box-return*
+        iterate-next
+    ] with-stack-frame ;
+
+! #alien-callback
+: box-parameters ( params -- )
+    alien-parameters [ box-parameter ] each-parameter ;
+
+: registers>objects ( node -- )
+    [
+        dup \ %save-param-reg move-parameters
+        "nest_stacks" f %alien-invoke
+        box-parameters
+    ] with-param-regs ;
+
+TUPLE: callback-context ;
+
+: current-callback 2 getenv ;
+
+: wait-to-return ( token -- )
+    dup current-callback eq? [
+        drop
+    ] [
+        yield wait-to-return
+    ] if ;
+
+: do-callback ( quot token -- )
+    init-catchstack
+    dup 2 setenv
+    slip
+    wait-to-return ; inline
+
+: callback-return-quot ( ctype -- quot )
+    return>> {
+        { [ dup "void" = ] [ drop [ ] ] }
+        { [ dup large-struct? ] [ heap-size [ memcpy ] curry ] }
+        [ c-type c-type-unboxer-quot ]
+    } cond ;
+
+: callback-prep-quot ( params -- quot )
+    parameters>> [ c-type c-type-boxer-quot ] map spread>quot ;
+
+: wrap-callback-quot ( params -- quot )
+    [
+        [ callback-prep-quot ]
+        [ quot>> ]
+        [ callback-return-quot ] tri 3append ,
+        [ callback-context new do-callback ] %
+    ] [ ] make ;
+
+: %unnest-stacks ( -- ) "unnest_stacks" f %alien-invoke ;
+
+: callback-unwind ( params -- n )
+    {
+        { [ dup abi>> "stdcall" = ] [ alien-stack-frame ] }
+        { [ dup return>> large-struct? ] [ drop 4 ] }
+        [ drop 0 ]
+    } cond ;
+
+: %callback-return ( params -- )
+    #! All the extra book-keeping for %unwind is only for x86.
+    #! On other platforms its an alias for %return.
+    dup alien-return
+    [ %unnest-stacks ] [ %callback-value ] if-void
+    callback-unwind %unwind ;
+
+: generate-callback ( params -- )
+    dup xt>> dup [
+        init-templates
+        %prologue
+        dup alien-stack-frame [
+            [ registers>objects ]
+            [ wrap-callback-quot %alien-callback ]
+            [ %callback-return ]
+            tri
+        ] with-stack-frame
+    ] with-cfg-builder ;
+
+M: #alien-callback generate-node
+    end-basic-block
+    params>> generate-callback iterate-next ;
diff --git a/unfinished/compiler/backend/backend.factor b/unfinished/compiler/backend/backend.factor
new file mode 100644
index 0000000000..c1944eb9a7
--- /dev/null
+++ b/unfinished/compiler/backend/backend.factor
@@ -0,0 +1,10 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: system ;
+IN: compiler.backend
+
+! Is this structure small enough to be returned in registers?
+HOOK: struct-small-enough? cpu ( size -- ? )
+
+! Mapping from register class to machine registers
+HOOK: machine-registers cpu ( -- assoc )
diff --git a/unfinished/compiler/backend/x86/32/32.factor b/unfinished/compiler/backend/x86/32/32.factor
new file mode 100644
index 0000000000..85df673839
--- /dev/null
+++ b/unfinished/compiler/backend/x86/32/32.factor
@@ -0,0 +1,10 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: system cpu.x86.assembler compiler.registers compiler.backend ;
+IN: compiler.backend.x86.32
+
+M: x86.32 machine-registers
+    {
+        { int-regs { EAX ECX EDX EBP EBX } }
+        { float-regs { XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7 } }
+    } ;
diff --git a/unfinished/compiler/cfg/alias/alias.factor b/unfinished/compiler/cfg.bluesky/alias/alias.factor
similarity index 100%
rename from unfinished/compiler/cfg/alias/alias.factor
rename to unfinished/compiler/cfg.bluesky/alias/alias.factor
diff --git a/unfinished/compiler/cfg/authors.txt b/unfinished/compiler/cfg.bluesky/authors.txt
similarity index 100%
rename from unfinished/compiler/cfg/authors.txt
rename to unfinished/compiler/cfg.bluesky/authors.txt
diff --git a/unfinished/compiler/cfg.bluesky/builder/builder-tests.factor b/unfinished/compiler/cfg.bluesky/builder/builder-tests.factor
new file mode 100644
index 0000000000..098919c868
--- /dev/null
+++ b/unfinished/compiler/cfg.bluesky/builder/builder-tests.factor
@@ -0,0 +1,4 @@
+IN: compiler.cfg.builder.tests
+USING: compiler.cfg.builder tools.test ;
+
+\ build-cfg must-infer
diff --git a/unfinished/compiler/cfg.bluesky/builder/builder.factor b/unfinished/compiler/cfg.bluesky/builder/builder.factor
new file mode 100644
index 0000000000..76a1b67dd2
--- /dev/null
+++ b/unfinished/compiler/cfg.bluesky/builder/builder.factor
@@ -0,0 +1,256 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: arrays kernel assocs sequences sequences.lib fry accessors
+namespaces math combinators math.order
+compiler.tree
+compiler.tree.combinators
+compiler.tree.propagation.info
+compiler.cfg
+compiler.vops
+compiler.vops.builder ;
+IN: compiler.cfg.builder
+
+! Convert tree SSA IR to CFG SSA IR.
+
+! We construct the graph and set successors first, then we
+! set predecessors in a separate pass. This simplifies the
+! logic.
+
+SYMBOL: procedures
+
+SYMBOL: loop-nesting
+
+SYMBOL: values>vregs
+
+GENERIC: convert ( node -- )
+
+M: #introduce convert drop ;
+
+: init-builder ( -- )
+    H{ } clone values>vregs set ;
+
+: end-basic-block ( -- )
+    basic-block get [ %b emit ] when ;
+
+: set-basic-block ( basic-block -- )
+    [ basic-block set ] [ instructions>> building set ] bi ;
+
+: begin-basic-block ( -- )
+    <basic-block> basic-block get
+    [
+        end-basic-block
+        dupd successors>> push
+    ] when*
+    set-basic-block ;
+
+: convert-nodes ( node -- )
+    [ convert ] each ;
+
+: (build-cfg) ( node word -- )
+    init-builder
+    begin-basic-block
+    basic-block get swap procedures get set-at
+    convert-nodes ;
+
+: build-cfg ( node word -- procedures )
+    H{ } clone [
+        procedures [ (build-cfg) ] with-variable
+    ] keep ;
+
+: value>vreg ( value -- vreg )
+    values>vregs get at ;
+
+: output-vreg ( value vreg -- )
+    swap values>vregs get set-at ;
+
+: produce-vreg ( value -- vreg )
+    next-vreg [ output-vreg ] keep ;
+
+: (load-inputs) ( seq stack -- )
+    over empty? [ 2drop ] [
+        [ <reversed> ] dip
+        [ '[ produce-vreg _ , %peek emit ] each-index ]
+        [ [ length neg ] dip %height emit ]
+        2bi
+    ] if ;
+
+: load-in-d ( node -- ) in-d>> %data (load-inputs) ;
+
+: load-in-r ( node -- ) in-r>> %retain (load-inputs) ;
+
+: (store-outputs) ( seq stack -- )
+    over empty? [ 2drop ] [
+        [ <reversed> ] dip
+        [ [ length ] dip %height emit ]
+        [ '[ value>vreg _ , %replace emit ] each-index ]
+        2bi
+    ] if ;
+
+: store-out-d ( node -- ) out-d>> %data (store-outputs) ;
+
+: store-out-r ( node -- ) out-r>> %retain (store-outputs) ;
+
+: (emit-call) ( word -- )
+    begin-basic-block %call emit begin-basic-block ;
+
+: intrinsic-inputs ( node -- )
+    [ load-in-d ]
+    [ in-d>> { #1 #2 #3 #4 } [ [ value>vreg ] dip set ] 2each ]
+    bi ;
+
+: intrinsic-outputs ( node -- )
+    [ out-d>> { ^1 ^2 ^3 ^4 } [ get output-vreg ] 2each ]
+    [ store-out-d ]
+    bi ;
+
+: intrinsic ( node quot -- )
+    [
+        init-intrinsic
+
+        [ intrinsic-inputs ]
+        swap
+        [ intrinsic-outputs ]
+        tri
+    ] with-scope ; inline
+
+USING: kernel.private math.private slots.private ;
+
+: maybe-emit-fixnum-shift-fast ( node -- node )
+    dup dup in-d>> second node-value-info literal>> dup fixnum? [
+        '[ , emit-fixnum-shift-fast ] intrinsic
+    ] [
+        drop dup word>> (emit-call)
+    ] if ;
+
+: emit-call ( node -- )
+    dup word>> {
+        { \ tag [ [ emit-tag ] intrinsic ] }
+
+        { \ slot [ [ dup emit-slot ] intrinsic ] }
+        { \ set-slot [ [ dup emit-set-slot ] intrinsic ] }
+
+        { \ fixnum-bitnot [ [ emit-fixnum-bitnot ] intrinsic ] }
+        { \ fixnum+fast [ [ emit-fixnum+fast ] intrinsic ] }
+        { \ fixnum-fast [ [ emit-fixnum-fast ] intrinsic ] }
+        { \ fixnum-bitand [ [ emit-fixnum-bitand ] intrinsic ] }
+        { \ fixnum-bitor [ [ emit-fixnum-bitor ] intrinsic ] }
+        { \ fixnum-bitxor [ [ emit-fixnum-bitxor ] intrinsic ] }
+        { \ fixnum*fast [ [ emit-fixnum*fast ] intrinsic ] }
+        { \ fixnum<= [ [ emit-fixnum<= ] intrinsic ] }
+        { \ fixnum>= [ [ emit-fixnum>= ] intrinsic ] }
+        { \ fixnum< [ [ emit-fixnum< ] intrinsic ] }
+        { \ fixnum> [ [ emit-fixnum> ] intrinsic ] }
+        { \ eq? [ [ emit-eq? ] intrinsic ] }
+
+        { \ fixnum-shift-fast [ maybe-emit-fixnum-shift-fast ] }
+
+        { \ float+ [ [ emit-float+ ] intrinsic ] }
+        { \ float- [ [ emit-float- ] intrinsic ] }
+        { \ float* [ [ emit-float* ] intrinsic ] }
+        { \ float/f [ [ emit-float/f ] intrinsic ] }
+        { \ float<= [ [ emit-float<= ] intrinsic ] }
+        { \ float>= [ [ emit-float>= ] intrinsic ] }
+        { \ float< [ [ emit-float< ] intrinsic ] }
+        { \ float> [ [ emit-float> ] intrinsic ] }
+        { \ float? [ [ emit-float= ] intrinsic ] }
+
+        ! { \ (tuple) [ dup first-input '[ , emit-(tuple) ] intrinsic ] }
+        ! { \ (array) [ dup first-input '[ , emit-(array) ] intrinsic ] }
+        ! { \ (byte-array) [ dup first-input '[ , emit-(byte-array) ] intrinsic ] }
+
+        [ (emit-call) ]
+    } case drop ;
+
+M: #call convert emit-call ;
+
+: emit-call-loop ( #recursive -- )
+    dup label>> loop-nesting get at basic-block get successors>> push
+    end-basic-block
+    basic-block off
+    drop ;
+
+: emit-call-recursive ( #recursive -- )
+    label>> id>> (emit-call) ;
+
+M: #call-recursive convert
+    dup label>> loop?>>
+    [ emit-call-loop ] [ emit-call-recursive ] if ;
+
+M: #push convert
+    [
+        [ out-d>> first produce-vreg ]
+        [ node-output-infos first literal>> ]
+        bi emit-literal
+    ]
+    [ store-out-d ] bi ;
+
+M: #shuffle convert [ load-in-d ] [ store-out-d ] bi ;
+
+M: #>r convert [ load-in-d ] [ store-out-r ] bi ;
+
+M: #r> convert [ load-in-r ] [ store-out-d ] bi ;
+
+M: #terminate convert drop ;
+
+: integer-conditional ( in1 in2 cc -- )
+    [ [ next-vreg dup ] 2dip %icmp emit ] dip %bi emit ; inline
+
+: float-conditional ( in1 in2 branch -- )
+    [ next-vreg [ %fcmp emit ] keep ] dip emit ; inline
+
+: emit-if ( #if -- )
+    in-d>> first value>vreg
+    next-vreg dup f emit-literal
+    cc/= integer-conditional ;
+
+: convert-nested ( node -- last-bb )
+    [
+        <basic-block>
+        [ set-basic-block ] keep
+        [ convert-nodes end-basic-block ] dip
+        basic-block get
+    ] with-scope
+    [ basic-block get successors>> push ] dip ;
+
+: convert-if-children ( #if -- )
+    children>> [ convert-nested ] map sift
+    <basic-block>
+    [ '[ , _ successors>> push ] each ]
+    [ set-basic-block ]
+    bi ;
+
+M: #if convert
+    [ load-in-d ] [ emit-if ] [ convert-if-children ] tri ;
+
+M: #dispatch convert
+    "Unimplemented" throw ;
+
+M: #phi convert drop ;
+
+M: #declare convert drop ;
+
+M: #return convert drop %return emit ;
+
+: convert-recursive ( #recursive -- )
+    [ [ label>> id>> ] [ child>> ] bi (build-cfg) ]
+    [ (emit-call) ]
+    bi ;
+
+: begin-loop ( #recursive -- )
+    label>> basic-block get 2array loop-nesting get push ;
+
+: end-loop ( -- )
+    loop-nesting get pop* ;
+
+: convert-loop ( #recursive -- )
+    begin-basic-block
+    [ begin-loop ]
+    [ child>> convert-nodes ]
+    [ drop end-loop ]
+    tri ;
+
+M: #recursive convert
+    dup label>> loop?>>
+    [ convert-loop ] [ convert-recursive ] if ;
+
+M: #copy convert drop ;
diff --git a/unfinished/compiler/cfg.bluesky/cfg.factor b/unfinished/compiler/cfg.bluesky/cfg.factor
new file mode 100644
index 0000000000..ae14f3e009
--- /dev/null
+++ b/unfinished/compiler/cfg.bluesky/cfg.factor
@@ -0,0 +1,47 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel accessors namespaces assocs sequences sets fry ;
+IN: compiler.cfg
+
+! The id is a globally unique id used for fast hashcode* and
+! equal? on basic blocks. The number is assigned by
+! linearization.
+TUPLE: basic-block < identity-tuple
+id
+number
+instructions
+successors
+predecessors
+stack-frame ;
+
+SYMBOL: next-block-id
+
+: <basic-block> ( -- basic-block )
+    basic-block new
+        next-block-id counter >>id
+        V{ } clone >>instructions
+        V{ } clone >>successors
+        V{ } clone >>predecessors ;
+
+M: basic-block hashcode* id>> nip ;
+
+! Utilities
+SYMBOL: visited-blocks
+
+: visit-block ( basic-block quot -- )
+    over visited-blocks get 2dup key?
+    [ 2drop 2drop ] [ conjoin call ] if ; inline
+
+: (each-block) ( basic-block quot -- )
+    '[
+        ,
+        [ call ]
+        [ [ successors>> ] dip '[ , (each-block) ] each ]
+        2bi
+    ] visit-block ; inline
+
+: each-block ( basic-block quot -- )
+    H{ } clone visited-blocks [ (each-block) ] with-variable ; inline
+
+: copy-at ( from to assoc -- )
+    3dup nip at* [ -rot set-at drop ] [ 2drop 2drop ] if ; inline
diff --git a/unfinished/compiler/cfg/elaboration/elaboration.factor b/unfinished/compiler/cfg.bluesky/elaboration/elaboration.factor
similarity index 100%
rename from unfinished/compiler/cfg/elaboration/elaboration.factor
rename to unfinished/compiler/cfg.bluesky/elaboration/elaboration.factor
diff --git a/unfinished/compiler/cfg/kill-nops/kill-nops.factor b/unfinished/compiler/cfg.bluesky/kill-nops/kill-nops.factor
similarity index 100%
rename from unfinished/compiler/cfg/kill-nops/kill-nops.factor
rename to unfinished/compiler/cfg.bluesky/kill-nops/kill-nops.factor
diff --git a/unfinished/compiler/cfg/live-ranges/live-ranges.factor b/unfinished/compiler/cfg.bluesky/live-ranges/live-ranges.factor
similarity index 100%
rename from unfinished/compiler/cfg/live-ranges/live-ranges.factor
rename to unfinished/compiler/cfg.bluesky/live-ranges/live-ranges.factor
diff --git a/unfinished/compiler/cfg/predecessors/predecessors.factor b/unfinished/compiler/cfg.bluesky/predecessors/predecessors.factor
similarity index 100%
rename from unfinished/compiler/cfg/predecessors/predecessors.factor
rename to unfinished/compiler/cfg.bluesky/predecessors/predecessors.factor
diff --git a/unfinished/compiler/cfg/simplifier/simplifier.factor b/unfinished/compiler/cfg.bluesky/simplifier/simplifier.factor
similarity index 100%
rename from unfinished/compiler/cfg/simplifier/simplifier.factor
rename to unfinished/compiler/cfg.bluesky/simplifier/simplifier.factor
diff --git a/unfinished/compiler/cfg/stack/stack.factor b/unfinished/compiler/cfg.bluesky/stack/stack.factor
similarity index 100%
rename from unfinished/compiler/cfg/stack/stack.factor
rename to unfinished/compiler/cfg.bluesky/stack/stack.factor
diff --git a/unfinished/compiler/cfg/summary.txt b/unfinished/compiler/cfg.bluesky/summary.txt
similarity index 100%
rename from unfinished/compiler/cfg/summary.txt
rename to unfinished/compiler/cfg.bluesky/summary.txt
diff --git a/unfinished/compiler/cfg/vn/conditions/conditions.factor b/unfinished/compiler/cfg.bluesky/vn/conditions/conditions.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/conditions/conditions.factor
rename to unfinished/compiler/cfg.bluesky/vn/conditions/conditions.factor
diff --git a/unfinished/compiler/cfg/vn/constant-fold/constant-fold.factor b/unfinished/compiler/cfg.bluesky/vn/constant-fold/constant-fold.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/constant-fold/constant-fold.factor
rename to unfinished/compiler/cfg.bluesky/vn/constant-fold/constant-fold.factor
diff --git a/unfinished/compiler/cfg/vn/expressions/expressions.factor b/unfinished/compiler/cfg.bluesky/vn/expressions/expressions.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/expressions/expressions.factor
rename to unfinished/compiler/cfg.bluesky/vn/expressions/expressions.factor
diff --git a/unfinished/compiler/cfg/vn/graph/graph.factor b/unfinished/compiler/cfg.bluesky/vn/graph/graph.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/graph/graph.factor
rename to unfinished/compiler/cfg.bluesky/vn/graph/graph.factor
diff --git a/unfinished/compiler/cfg/vn/liveness/liveness.factor b/unfinished/compiler/cfg.bluesky/vn/liveness/liveness.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/liveness/liveness.factor
rename to unfinished/compiler/cfg.bluesky/vn/liveness/liveness.factor
diff --git a/unfinished/compiler/cfg/vn/propagate/propagate.factor b/unfinished/compiler/cfg.bluesky/vn/propagate/propagate.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/propagate/propagate.factor
rename to unfinished/compiler/cfg.bluesky/vn/propagate/propagate.factor
diff --git a/unfinished/compiler/cfg/vn/simplify/simplify.factor b/unfinished/compiler/cfg.bluesky/vn/simplify/simplify.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/simplify/simplify.factor
rename to unfinished/compiler/cfg.bluesky/vn/simplify/simplify.factor
diff --git a/unfinished/compiler/cfg/vn/vn.factor b/unfinished/compiler/cfg.bluesky/vn/vn.factor
similarity index 100%
rename from unfinished/compiler/cfg/vn/vn.factor
rename to unfinished/compiler/cfg.bluesky/vn/vn.factor
diff --git a/unfinished/compiler/cfg/write-barrier/write-barrier.factor b/unfinished/compiler/cfg.bluesky/write-barrier/write-barrier.factor
similarity index 100%
rename from unfinished/compiler/cfg/write-barrier/write-barrier.factor
rename to unfinished/compiler/cfg.bluesky/write-barrier/write-barrier.factor
diff --git a/unfinished/compiler/cfg/builder/authors.txt b/unfinished/compiler/cfg/builder/authors.txt
new file mode 100644
index 0000000000..1901f27a24
--- /dev/null
+++ b/unfinished/compiler/cfg/builder/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
diff --git a/unfinished/compiler/cfg/builder/builder-tests.factor b/unfinished/compiler/cfg/builder/builder-tests.factor
index 098919c868..a9f3f2eaa9 100644
--- a/unfinished/compiler/cfg/builder/builder-tests.factor
+++ b/unfinished/compiler/cfg/builder/builder-tests.factor
@@ -1,4 +1,39 @@
 IN: compiler.cfg.builder.tests
-USING: compiler.cfg.builder tools.test ;
+USING: tools.test kernel sequences
+words sequences.private fry prettyprint alien
+math.private compiler.tree.builder compiler.tree.optimizer
+compiler.cfg.builder compiler.cfg.debugger  ;
 
-\ build-cfg must-infer
+! Just ensure that various CFGs build correctly.
+{
+    [ ]
+    [ dup ]
+    [ swap ]
+    [ >r r> ]
+    [ fixnum+ ]
+    [ fixnum< ]
+    [ [ 1 ] [ 2 ] if ]
+    [ fixnum< [ 1 ] [ 2 ] if ]
+    [ float+ [ 2.0 float* ] [ 3.0 float* ] bi float/f ]
+    [ { [ 1 ] [ 2 ] [ 3 ] } dispatch ]
+    [ [ t ] loop ]
+    [ [ dup ] loop ]
+    [ [ 2 ] [ 3 throw ] if 4 ]
+    [ "int" f "malloc" { "int" } alien-invoke ]
+    [ "int" { "int" } "cdecl" alien-indirect ]
+    [ "int" { "int" } "cdecl" [ ] alien-callback ]
+} [
+    '[ _ test-cfg drop ] [ ] swap unit-test
+] each
+
+: test-1 ( -- ) test-1 ;
+: test-2 ( -- ) 3 . test-2 ;
+: test-3 ( a -- b ) dup [ test-3 ] when ;
+
+{
+    test-1
+    test-2
+    test-3
+} [
+    '[ _ test-cfg drop ] [ ] swap unit-test
+] each
diff --git a/unfinished/compiler/cfg/builder/builder.factor b/unfinished/compiler/cfg/builder/builder.factor
old mode 100644
new mode 100755
index 76a1b67dd2..86e69a50b7
--- a/unfinished/compiler/cfg/builder/builder.factor
+++ b/unfinished/compiler/cfg/builder/builder.factor
@@ -1,256 +1,297 @@
-! Copyright (C) 2008 Slava Pestov.
+ ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel assocs sequences sequences.lib fry accessors
-namespaces math combinators math.order
+USING: accessors arrays assocs combinators hashtables kernel
+math fry namespaces make sequences words stack-checker.inlining
 compiler.tree
+compiler.tree.builder
 compiler.tree.combinators
 compiler.tree.propagation.info
 compiler.cfg
-compiler.vops
-compiler.vops.builder ;
+compiler.cfg.stacks
+compiler.cfg.templates
+compiler.cfg.iterator
+compiler.alien
+compiler.instructions
+compiler.registers ;
 IN: compiler.cfg.builder
 
-! Convert tree SSA IR to CFG SSA IR.
-
-! We construct the graph and set successors first, then we
-! set predecessors in a separate pass. This simplifies the
-! logic.
-
-SYMBOL: procedures
-
-SYMBOL: loop-nesting
-
-SYMBOL: values>vregs
-
-GENERIC: convert ( node -- )
-
-M: #introduce convert drop ;
-
-: init-builder ( -- )
-    H{ } clone values>vregs set ;
-
-: end-basic-block ( -- )
-    basic-block get [ %b emit ] when ;
+! Convert tree SSA IR to CFG (not quite SSA yet) IR.
 
 : set-basic-block ( basic-block -- )
     [ basic-block set ] [ instructions>> building set ] bi ;
 
 : begin-basic-block ( -- )
-    <basic-block> basic-block get
-    [
-        end-basic-block
+    <basic-block> basic-block get [
         dupd successors>> push
     ] when*
     set-basic-block ;
 
-: convert-nodes ( node -- )
-    [ convert ] each ;
+: end-basic-block ( -- )
+    building off
+    basic-block off ;
 
-: (build-cfg) ( node word -- )
-    init-builder
+: stop-iterating ( -- next ) end-basic-block f ;
+
+USE: qualified
+FROM: compiler.generator.registers => +input+   ;
+FROM: compiler.generator.registers => +output+  ;
+FROM: compiler.generator.registers => +scratch+ ;
+FROM: compiler.generator.registers => +clobber+ ;
+
+SYMBOL: procedures
+
+SYMBOL: current-word
+
+SYMBOL: current-label
+
+SYMBOL: loops
+
+! Basic block after prologue, makes recursion faster
+SYMBOL: current-label-start
+
+: add-procedure ( -- )
+    basic-block get current-word get current-label get
+    <cfg> procedures get push ;
+
+: begin-procedure ( word label -- )
+    end-basic-block
     begin-basic-block
-    basic-block get swap procedures get set-at
-    convert-nodes ;
+    H{ } clone loops set
+    current-label set
+    current-word set
+    add-procedure ;
 
-: build-cfg ( node word -- procedures )
-    H{ } clone [
-        procedures [ (build-cfg) ] with-variable
+: with-cfg-builder ( nodes word label quot -- )
+    '[ begin-procedure @ ] with-scope ; inline
+
+GENERIC: emit-node ( node -- next )
+
+: check-basic-block ( node -- node' )
+    basic-block get [ drop f ] unless ; inline
+
+: emit-nodes ( nodes -- )
+    [ current-node emit-node check-basic-block ] iterate-nodes
+    finalize-phantoms ;
+
+: remember-loop ( label -- )
+    basic-block get swap loops get set-at ;
+
+: begin-word ( -- )
+    #! We store the basic block after the prologue as a loop
+    #! labelled by the current word, so that self-recursive
+    #! calls can skip an epilogue/prologue.
+    init-phantoms
+    %prologue
+    %branch
+    begin-basic-block
+    current-label get remember-loop ;
+
+: (build-cfg) ( nodes word label -- )
+    [
+        begin-word
+        [ emit-nodes ] with-node-iterator
+    ] with-cfg-builder ;
+
+: build-cfg ( nodes word label -- procedures )
+    V{ } clone [
+        procedures [
+            (build-cfg)
+        ] with-variable
     ] keep ;
 
-: value>vreg ( value -- vreg )
-    values>vregs get at ;
+: if-intrinsics ( #call -- quot )
+    word>> "if-intrinsics" word-prop ;
 
-: output-vreg ( value vreg -- )
-    swap values>vregs get set-at ;
+: local-recursive-call ( basic-block -- next )
+    %branch
+    basic-block get successors>> push
+    stop-iterating ;
 
-: produce-vreg ( value -- vreg )
-    next-vreg [ output-vreg ] keep ;
+: emit-call ( word -- next )
+    finalize-phantoms
+    {
+        { [ tail-call? not ] [ 0 %frame-required %call iterate-next ] }
+        { [ dup loops get key? ] [ loops get at local-recursive-call ] }
+        [ %epilogue %jump stop-iterating ]
+    } cond ;
 
-: (load-inputs) ( seq stack -- )
-    over empty? [ 2drop ] [
-        [ <reversed> ] dip
-        [ '[ produce-vreg _ , %peek emit ] each-index ]
-        [ [ length neg ] dip %height emit ]
-        2bi
-    ] if ;
+! #recursive
+: compile-recursive ( node -- next )
+    [ label>> id>> emit-call ]
+    [ [ child>> ] [ label>> word>> ] [ label>> id>> ] tri (build-cfg) ] bi ;
 
-: load-in-d ( node -- ) in-d>> %data (load-inputs) ;
-
-: load-in-r ( node -- ) in-r>> %retain (load-inputs) ;
-
-: (store-outputs) ( seq stack -- )
-    over empty? [ 2drop ] [
-        [ <reversed> ] dip
-        [ [ length ] dip %height emit ]
-        [ '[ value>vreg _ , %replace emit ] each-index ]
-        2bi
-    ] if ;
-
-: store-out-d ( node -- ) out-d>> %data (store-outputs) ;
-
-: store-out-r ( node -- ) out-r>> %retain (store-outputs) ;
-
-: (emit-call) ( word -- )
-    begin-basic-block %call emit begin-basic-block ;
-
-: intrinsic-inputs ( node -- )
-    [ load-in-d ]
-    [ in-d>> { #1 #2 #3 #4 } [ [ value>vreg ] dip set ] 2each ]
-    bi ;
-
-: intrinsic-outputs ( node -- )
-    [ out-d>> { ^1 ^2 ^3 ^4 } [ get output-vreg ] 2each ]
-    [ store-out-d ]
-    bi ;
-
-: intrinsic ( node quot -- )
-    [
-        init-intrinsic
-
-        [ intrinsic-inputs ]
-        swap
-        [ intrinsic-outputs ]
-        tri
-    ] with-scope ; inline
-
-USING: kernel.private math.private slots.private ;
-
-: maybe-emit-fixnum-shift-fast ( node -- node )
-    dup dup in-d>> second node-value-info literal>> dup fixnum? [
-        '[ , emit-fixnum-shift-fast ] intrinsic
-    ] [
-        drop dup word>> (emit-call)
-    ] if ;
-
-: emit-call ( node -- )
-    dup word>> {
-        { \ tag [ [ emit-tag ] intrinsic ] }
-
-        { \ slot [ [ dup emit-slot ] intrinsic ] }
-        { \ set-slot [ [ dup emit-set-slot ] intrinsic ] }
-
-        { \ fixnum-bitnot [ [ emit-fixnum-bitnot ] intrinsic ] }
-        { \ fixnum+fast [ [ emit-fixnum+fast ] intrinsic ] }
-        { \ fixnum-fast [ [ emit-fixnum-fast ] intrinsic ] }
-        { \ fixnum-bitand [ [ emit-fixnum-bitand ] intrinsic ] }
-        { \ fixnum-bitor [ [ emit-fixnum-bitor ] intrinsic ] }
-        { \ fixnum-bitxor [ [ emit-fixnum-bitxor ] intrinsic ] }
-        { \ fixnum*fast [ [ emit-fixnum*fast ] intrinsic ] }
-        { \ fixnum<= [ [ emit-fixnum<= ] intrinsic ] }
-        { \ fixnum>= [ [ emit-fixnum>= ] intrinsic ] }
-        { \ fixnum< [ [ emit-fixnum< ] intrinsic ] }
-        { \ fixnum> [ [ emit-fixnum> ] intrinsic ] }
-        { \ eq? [ [ emit-eq? ] intrinsic ] }
-
-        { \ fixnum-shift-fast [ maybe-emit-fixnum-shift-fast ] }
-
-        { \ float+ [ [ emit-float+ ] intrinsic ] }
-        { \ float- [ [ emit-float- ] intrinsic ] }
-        { \ float* [ [ emit-float* ] intrinsic ] }
-        { \ float/f [ [ emit-float/f ] intrinsic ] }
-        { \ float<= [ [ emit-float<= ] intrinsic ] }
-        { \ float>= [ [ emit-float>= ] intrinsic ] }
-        { \ float< [ [ emit-float< ] intrinsic ] }
-        { \ float> [ [ emit-float> ] intrinsic ] }
-        { \ float? [ [ emit-float= ] intrinsic ] }
-
-        ! { \ (tuple) [ dup first-input '[ , emit-(tuple) ] intrinsic ] }
-        ! { \ (array) [ dup first-input '[ , emit-(array) ] intrinsic ] }
-        ! { \ (byte-array) [ dup first-input '[ , emit-(byte-array) ] intrinsic ] }
-
-        [ (emit-call) ]
-    } case drop ;
-
-M: #call convert emit-call ;
-
-: emit-call-loop ( #recursive -- )
-    dup label>> loop-nesting get at basic-block get successors>> push
-    end-basic-block
-    basic-block off
-    drop ;
-
-: emit-call-recursive ( #recursive -- )
-    label>> id>> (emit-call) ;
-
-M: #call-recursive convert
-    dup label>> loop?>>
-    [ emit-call-loop ] [ emit-call-recursive ] if ;
-
-M: #push convert
-    [
-        [ out-d>> first produce-vreg ]
-        [ node-output-infos first literal>> ]
-        bi emit-literal
-    ]
-    [ store-out-d ] bi ;
-
-M: #shuffle convert [ load-in-d ] [ store-out-d ] bi ;
-
-M: #>r convert [ load-in-d ] [ store-out-r ] bi ;
-
-M: #r> convert [ load-in-r ] [ store-out-d ] bi ;
-
-M: #terminate convert drop ;
-
-: integer-conditional ( in1 in2 cc -- )
-    [ [ next-vreg dup ] 2dip %icmp emit ] dip %bi emit ; inline
-
-: float-conditional ( in1 in2 branch -- )
-    [ next-vreg [ %fcmp emit ] keep ] dip emit ; inline
-
-: emit-if ( #if -- )
-    in-d>> first value>vreg
-    next-vreg dup f emit-literal
-    cc/= integer-conditional ;
-
-: convert-nested ( node -- last-bb )
-    [
-        <basic-block>
-        [ set-basic-block ] keep
-        [ convert-nodes end-basic-block ] dip
-        basic-block get
-    ] with-scope
-    [ basic-block get successors>> push ] dip ;
-
-: convert-if-children ( #if -- )
-    children>> [ convert-nested ] map sift
-    <basic-block>
-    [ '[ , _ successors>> push ] each ]
-    [ set-basic-block ]
-    bi ;
-
-M: #if convert
-    [ load-in-d ] [ emit-if ] [ convert-if-children ] tri ;
-
-M: #dispatch convert
-    "Unimplemented" throw ;
-
-M: #phi convert drop ;
-
-M: #declare convert drop ;
-
-M: #return convert drop %return emit ;
-
-: convert-recursive ( #recursive -- )
-    [ [ label>> id>> ] [ child>> ] bi (build-cfg) ]
-    [ (emit-call) ]
-    bi ;
-
-: begin-loop ( #recursive -- )
-    label>> basic-block get 2array loop-nesting get push ;
-
-: end-loop ( -- )
-    loop-nesting get pop* ;
-
-: convert-loop ( #recursive -- )
+: compile-loop ( node -- next )
+    finalize-phantoms
     begin-basic-block
-    [ begin-loop ]
-    [ child>> convert-nodes ]
-    [ drop end-loop ]
-    tri ;
+    [ label>> id>> remember-loop ] [ child>> emit-nodes ] bi
+    iterate-next ;
 
-M: #recursive convert
-    dup label>> loop?>>
-    [ convert-loop ] [ convert-recursive ] if ;
+M: #recursive emit-node
+    dup label>> loop?>> [ compile-loop ] [ compile-recursive ] if ;
 
-M: #copy convert drop ;
+! #if
+: emit-branch ( nodes -- final-bb )
+    [
+        begin-basic-block copy-phantoms
+        emit-nodes
+        basic-block get dup [ %branch ] when
+    ] with-scope ;
+
+: emit-if ( node -- next )
+    children>> [ emit-branch ] map
+    end-basic-block
+    begin-basic-block
+    basic-block get '[ [ _ swap successors>> push ] when* ] each
+    init-phantoms
+    iterate-next ;
+
+M: #if emit-node
+    { { f "flag" } } lazy-load first %branch-t
+    emit-if ;
+
+! #dispatch
+: dispatch-branch ( nodes word -- label )
+    gensym [
+        [
+            copy-phantoms
+            %prologue
+            [ emit-nodes ] with-node-iterator
+            %epilogue
+            %return
+        ] with-cfg-builder
+    ] keep ;
+
+: dispatch-branches ( node -- )
+    children>> [
+        current-word get dispatch-branch
+        %dispatch-label
+    ] each ;
+
+: emit-dispatch ( node -- )
+    %dispatch dispatch-branches init-phantoms ;
+
+M: #dispatch emit-node
+    #! The order here is important, dispatch-branches must
+    #! run after %dispatch, so that each branch gets the
+    #! correct register state
+    tail-call? [
+        emit-dispatch iterate-next
+    ] [
+        current-word get gensym [
+            [
+                begin-word
+                emit-dispatch
+            ] with-cfg-builder
+        ] keep emit-call
+    ] if ;
+
+! #call
+: define-intrinsics ( word intrinsics -- )
+    "intrinsics" set-word-prop ;
+
+: define-intrinsic ( word quot assoc -- )
+    2array 1array define-intrinsics ;
+
+: define-if-intrinsics ( word intrinsics -- )
+    [ +input+ associate ] assoc-map
+    "if-intrinsics" set-word-prop ;
+
+: define-if-intrinsic ( word quot inputs -- )
+    2array 1array define-if-intrinsics ;
+
+: find-intrinsic ( #call -- pair/f )
+    word>> "intrinsics" word-prop find-template ;
+
+: find-boolean-intrinsic ( #call -- pair/f )
+    word>> "if-intrinsics" word-prop find-template ;
+
+: find-if-intrinsic ( #call -- pair/f )
+    node@ {
+        { [ dup length 2 < ] [ 2drop f ] }
+        { [ dup second #if? ] [ drop find-boolean-intrinsic ] }
+        [ 2drop f ]
+    } cond ;
+
+: do-if-intrinsic ( pair -- next )
+    [ %if-intrinsic ] apply-template skip-next emit-if ;
+
+: do-boolean-intrinsic ( pair -- next )
+    [
+        f alloc-vreg [ %boolean-intrinsic ] keep phantom-push
+    ] apply-template iterate-next ;
+
+: do-intrinsic ( pair -- next )
+    [ %intrinsic ] apply-template iterate-next ;
+
+: setup-operand-classes ( #call -- )
+    node-input-infos [ class>> ] map set-operand-classes ;
+
+M: #call emit-node
+    dup setup-operand-classes
+    dup find-if-intrinsic [ do-if-intrinsic ] [
+        dup find-boolean-intrinsic [ do-boolean-intrinsic ] [
+            dup find-intrinsic [ do-intrinsic ] [
+                word>> emit-call
+            ] ?if
+        ] ?if
+    ] ?if ;
+
+! #call-recursive
+M: #call-recursive emit-node label>> id>> emit-call ;
+
+! #push
+M: #push emit-node
+    literal>> <constant> phantom-push iterate-next ;
+
+! #shuffle
+M: #shuffle emit-node
+    shuffle-effect phantom-shuffle iterate-next ;
+
+M: #>r emit-node
+    [ in-d>> length ] [ out-r>> empty? ] bi
+    [ phantom-drop ] [ phantom->r ] if
+    iterate-next ;
+
+M: #r> emit-node
+    [ in-r>> length ] [ out-d>> empty? ] bi
+    [ phantom-rdrop ] [ phantom-r> ] if
+    iterate-next ;
+
+! #return
+M: #return emit-node
+    drop finalize-phantoms %epilogue %return f ;
+
+M: #return-recursive emit-node
+    finalize-phantoms
+    label>> id>> loops get key?
+    [ %epilogue %return ] unless f ;
+
+! #terminate
+M: #terminate emit-node drop stop-iterating ;
+
+! FFI
+M: #alien-invoke emit-node
+    params>>
+    [ alien-invoke-frame %frame-required ]
+    [ %alien-invoke iterate-next ]
+    bi ;
+
+M: #alien-indirect emit-node
+    params>>
+    [ alien-invoke-frame %frame-required ]
+    [ %alien-indirect iterate-next ]
+    bi ;
+
+M: #alien-callback emit-node
+    params>> dup xt>> dup
+    [ init-phantoms %alien-callback ] with-cfg-builder
+    iterate-next ;
+
+! No-op nodes
+M: #introduce emit-node drop iterate-next ;
+
+M: #copy emit-node drop iterate-next ;
+
+M: #enter-recursive emit-node drop iterate-next ;
+
+M: #phi emit-node drop iterate-next ;
diff --git a/unfinished/compiler/cfg/builder/summary.txt b/unfinished/compiler/cfg/builder/summary.txt
new file mode 100644
index 0000000000..cf857ad971
--- /dev/null
+++ b/unfinished/compiler/cfg/builder/summary.txt
@@ -0,0 +1 @@
+Final stage of compilation generates machine code from dataflow IR
diff --git a/unfinished/compiler/cfg/builder/tags.txt b/unfinished/compiler/cfg/builder/tags.txt
new file mode 100644
index 0000000000..86a7c8e637
--- /dev/null
+++ b/unfinished/compiler/cfg/builder/tags.txt
@@ -0,0 +1 @@
+compiler
diff --git a/unfinished/compiler/cfg/cfg.factor b/unfinished/compiler/cfg/cfg.factor
index ae14f3e009..9acf0897b9 100644
--- a/unfinished/compiler/cfg/cfg.factor
+++ b/unfinished/compiler/cfg/cfg.factor
@@ -3,45 +3,25 @@
 USING: kernel accessors namespaces assocs sequences sets fry ;
 IN: compiler.cfg
 
-! The id is a globally unique id used for fast hashcode* and
-! equal? on basic blocks. The number is assigned by
-! linearization.
+TUPLE: cfg entry word label ;
+
+C: <cfg> cfg
+
+! - "number" and "visited" is used by linearization.
 TUPLE: basic-block < identity-tuple
-id
+visited
 number
+label
 instructions
 successors
-predecessors
-stack-frame ;
-
-SYMBOL: next-block-id
+predecessors ;
 
 : <basic-block> ( -- basic-block )
     basic-block new
-        next-block-id counter >>id
         V{ } clone >>instructions
         V{ } clone >>successors
         V{ } clone >>predecessors ;
 
-M: basic-block hashcode* id>> nip ;
+TUPLE: mr instructions word label ;
 
-! Utilities
-SYMBOL: visited-blocks
-
-: visit-block ( basic-block quot -- )
-    over visited-blocks get 2dup key?
-    [ 2drop 2drop ] [ conjoin call ] if ; inline
-
-: (each-block) ( basic-block quot -- )
-    '[
-        ,
-        [ call ]
-        [ [ successors>> ] dip '[ , (each-block) ] each ]
-        2bi
-    ] visit-block ; inline
-
-: each-block ( basic-block quot -- )
-    H{ } clone visited-blocks [ (each-block) ] with-variable ; inline
-
-: copy-at ( from to assoc -- )
-    3dup nip at* [ -rot set-at drop ] [ 2drop 2drop ] if ; inline
+C: <mr> mr
diff --git a/unfinished/compiler/cfg/debugger/debugger.factor b/unfinished/compiler/cfg/debugger/debugger.factor
new file mode 100644
index 0000000000..65b0b97476
--- /dev/null
+++ b/unfinished/compiler/cfg/debugger/debugger.factor
@@ -0,0 +1,29 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel words sequences quotations namespaces io
+accessors prettyprint prettyprint.config
+compiler.tree.builder compiler.tree.optimizer
+compiler.cfg.builder compiler.cfg.linearization ;
+IN: compiler.cfg.debugger
+
+GENERIC: test-cfg ( quot -- cfgs )
+
+M: callable test-cfg
+    build-tree optimize-tree gensym gensym build-cfg ;
+
+M: word test-cfg
+    [ build-tree-from-word nip optimize-tree ] keep dup
+    build-cfg ;
+
+: test-mr ( quot -- mrs ) test-cfg [ build-mr ] map ;
+
+: mr. ( mrs -- )
+    [
+        boa-tuples? on
+        "=== word: " write
+        dup word>> pprint
+        ", label: " write
+        dup label>> pprint nl nl
+        instructions>> .
+        nl
+    ] each ;
diff --git a/unfinished/compiler/cfg/iterator/iterator.factor b/unfinished/compiler/cfg/iterator/iterator.factor
new file mode 100644
index 0000000000..904da3f0c3
--- /dev/null
+++ b/unfinished/compiler/cfg/iterator/iterator.factor
@@ -0,0 +1,48 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: namespaces sequences kernel compiler.tree ;
+IN: compiler.cfg.iterator
+
+SYMBOL: node-stack
+
+: >node ( cursor -- ) node-stack get push ;
+: node> ( -- cursor ) node-stack get pop ;
+: node@ ( -- cursor ) node-stack get peek ;
+: current-node ( -- node ) node@ first ;
+: iterate-next ( -- cursor ) node@ rest-slice ;
+: skip-next ( -- next ) node> rest-slice [ first ] [ >node ] bi ;
+
+: iterate-nodes ( cursor quot: ( -- ) -- )
+    over empty? [
+        2drop
+    ] [
+        [ swap >node call node> drop ] keep iterate-nodes
+    ] if ; inline recursive
+
+: with-node-iterator ( quot -- )
+    >r V{ } clone node-stack r> with-variable ; inline
+
+DEFER: (tail-call?)
+
+: tail-phi? ( cursor -- ? )
+    [ first #phi? ] [ rest-slice (tail-call?) ] bi and ;
+
+: (tail-call?) ( cursor -- ? )
+    [ t ] [
+        [
+            first
+            [ #return? ]
+            [ #return-recursive? ]
+            [ #terminate? ] tri or or
+        ] [ tail-phi? ] bi or
+    ] if-empty ;
+
+: tail-call? ( -- ? )
+    node-stack get [
+        rest-slice
+        [ t ] [
+            [ (tail-call?) ]
+            [ first #terminate? not ]
+            bi and
+        ] if-empty
+    ] all? ;
diff --git a/unfinished/compiler/cfg/linear-scan/allocation/allocation.factor b/unfinished/compiler/cfg/linear-scan/allocation/allocation.factor
new file mode 100644
index 0000000000..37e1d512cd
--- /dev/null
+++ b/unfinished/compiler/cfg/linear-scan/allocation/allocation.factor
@@ -0,0 +1,90 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: namespaces sequences math math.order kernel assocs
+accessors vectors fry
+compiler.cfg.linear-scan.live-intervals
+compiler.backend ;
+IN: compiler.cfg.linear-scan.allocation
+
+! Mapping from vregs to machine registers
+SYMBOL: register-allocation
+
+! Mapping from vregs to spill locations
+SYMBOL: spill-locations
+
+! Vector of active live intervals, in order of increasing end point
+SYMBOL: active-intervals
+
+: add-active ( live-interval -- )
+    active-intervals get push ;
+
+: delete-active ( live-interval -- )
+    active-intervals get delete ;
+
+! Mapping from register classes to sequences of machine registers
+SYMBOL: free-registers
+
+! Counter of spill locations
+SYMBOL: spill-counter
+
+: next-spill-location ( -- n )
+    spill-counter [ dup 1+ ] change ;
+
+: assign-spill ( live-interval -- )
+    next-spill-location swap vreg>> spill-locations get set-at ;
+
+: free-registers-for ( vreg -- seq )
+    reg-class>> free-registers get at ;
+
+: free-register ( vreg -- )
+    #! Free machine register currently assigned to vreg.
+    [ register-allocation get at ] [ free-registers-for ] bi push ;
+
+: expire-old-intervals ( live-interval -- )
+    active-intervals get
+    swap '[ end>> _ start>> < ] partition
+    active-intervals set
+    [ vreg>> free-register ] each ;
+
+: interval-to-spill ( -- live-interval )
+    #! We spill the interval with the longest remaining range.
+    active-intervals get unclip-slice [
+        [ [ end>> ] bi@ > ] most
+    ] reduce ;
+
+: reuse-register ( live-interval to-spill -- )
+    vreg>> swap vreg>>
+    register-allocation get
+    tuck [ at ] [ set-at ] 2bi* ;
+
+: spill-at-interval ( live-interval -- )
+    interval-to-spill
+    2dup [ end>> ] bi@ > [
+        [ reuse-register ]
+        [ nip assign-spill ]
+        [ [ add-active ] [ delete-active ] bi* ]
+        2tri
+    ] [ drop assign-spill ] if ;
+
+: init-allocator ( -- )
+    H{ } clone register-allocation set
+    H{ } clone spill-locations set
+    V{ } clone active-intervals set
+    machine-registers [ >vector ] assoc-map free-registers set
+    0 spill-counter set ;
+
+: assign-register ( live-interval register -- )
+    swap vreg>> register-allocation get set-at ;
+
+: allocate-register ( live-interval -- )
+    dup vreg>> free-registers-for [
+        spill-at-interval
+    ] [
+        [ pop assign-register ]
+        [ drop add-active ]
+        2bi
+    ] if-empty ;
+
+: allocate-registers ( live-intervals -- )
+    init-allocator
+    [ [ expire-old-intervals ] [ allocate-register ] bi ] each ;
diff --git a/unfinished/compiler/cfg/linear-scan/linear-scan.factor b/unfinished/compiler/cfg/linear-scan/linear-scan.factor
new file mode 100644
index 0000000000..307eecf53a
--- /dev/null
+++ b/unfinished/compiler/cfg/linear-scan/linear-scan.factor
@@ -0,0 +1,6 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: compiler.cfg.linear-scan
+
+! See http://www.cs.ucla.edu/~palsberg/course/cs132/linearscan.pdf
+
diff --git a/unfinished/compiler/cfg/linear-scan/live-intervals/live-intervals.factor b/unfinished/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
new file mode 100644
index 0000000000..6a3514c4e2
--- /dev/null
+++ b/unfinished/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
@@ -0,0 +1,32 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: namespaces kernel assocs accessors sequences math
+math.order sorting compiler.instructions compiler.registers ;
+IN: compiler.cfg.linear-scan.live-intervals
+
+TUPLE: live-interval < identity-tuple vreg start end ;
+
+M: live-interval hashcode* nip [ start>> ] [ end>> 1000 * ] bi + ;
+
+! Mapping from vreg to live-interval
+SYMBOL: live-intervals
+
+: update-live-interval ( n vreg -- )
+    >vreg
+    live-intervals get
+    [ over f live-interval boa ] cache
+    (>>end) ;
+
+: compute-live-intervals* ( n insn -- )
+    uses-vregs [ update-live-interval ] with each ;
+
+: sort-live-intervals ( assoc -- seq' )
+    #! Sort by increasing start location.
+    values [ [ start>> ] compare ] sort ;
+
+: compute-live-intervals ( instructions -- live-intervals )
+    H{ } clone [
+        live-intervals [
+            [ swap compute-live-intervals* ] each-index
+        ] with-variable
+    ] keep sort-live-intervals ;
diff --git a/unfinished/compiler/cfg/linearization/linearization.factor b/unfinished/compiler/cfg/linearization/linearization.factor
new file mode 100644
index 0000000000..2aa7c66777
--- /dev/null
+++ b/unfinished/compiler/cfg/linearization/linearization.factor
@@ -0,0 +1,93 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel math accessors sequences namespaces make
+combinators compiler.cfg compiler.cfg.rpo compiler.instructions
+compiler.instructions.syntax ;
+IN: compiler.cfg.linearization
+
+! Convert CFG IR to machine IR.
+SYMBOL: frame-size
+
+: compute-frame-size ( rpo -- )
+    [ instructions>> [ %frame-required? ] filter ] map concat
+    [ f ] [ [ n>> ] map supremum ] if-empty
+    frame-size set ;
+
+GENERIC: linearize-insn ( basic-block insn -- )
+
+: linearize-insns ( basic-block -- )
+    dup instructions>> [ linearize-insn ] with each ; inline
+
+M: insn linearize-insn , drop ;
+
+M: %frame-required linearize-insn 2drop ;
+
+M: %prologue linearize-insn
+    2drop frame-size get [ _prologue ] when* ;
+
+M: %epilogue linearize-insn
+    2drop frame-size get [ _epilogue ] when* ;
+
+: useless-branch? ( basic-block successor -- ? )
+    #! If our successor immediately follows us in RPO, then we
+    #! don't need to branch.
+    [ number>> 1+ ] [ number>> ] bi* = ; inline
+
+: branch-to-return? ( successor -- ? )
+    #! A branch to a block containing just a return is cloned.
+    instructions>> dup length 2 = [
+        [ first %epilogue? ] [ second %return? ] bi and
+    ] [ drop f ] if ;
+
+: emit-branch ( basic-block successor -- )
+    {
+        { [ 2dup useless-branch? ] [ 2drop ] }
+        { [ dup branch-to-return? ] [ nip linearize-insns ] }
+        [ nip label>> _branch ]
+    } cond ;
+
+M: %branch linearize-insn
+    drop dup successors>> first emit-branch ;
+
+: conditional ( basic-block -- basic-block successor1 label2 )
+    dup successors>> first2 swap label>> ; inline
+
+: boolean-conditional ( basic-block insn -- basic-block successor vreg label2 )
+    [ conditional ] [ vreg>> ] bi* swap ; inline
+
+M: %branch-f linearize-insn
+    boolean-conditional _branch-f emit-branch ;
+
+M: %branch-t linearize-insn
+    boolean-conditional _branch-t emit-branch ;
+
+M: %if-intrinsic linearize-insn
+    [ conditional ] [ [ quot>> ] [ vregs>> ] bi ] bi*
+    _if-intrinsic emit-branch ;
+
+M: %boolean-intrinsic linearize-insn
+    [
+        "false" define-label
+        "end" define-label
+        "false" get over [ quot>> ] [ vregs>> ] bi _if-intrinsic
+        t over out>> %load-literal
+        "end" get _branch
+        "false" resolve-label
+        f over out>> %load-literal
+        "end" resolve-label
+    ] with-scope
+    2drop ;
+
+: linearize-basic-block ( bb -- )
+    [ label>> _label ] [ linearize-insns ] bi ;
+
+: linearize-basic-blocks ( rpo -- insns )
+    [ [ linearize-basic-block ] each ] { } make ;
+
+: build-mr ( cfg -- mr )
+    [
+        entry>> reverse-post-order [
+            [ compute-frame-size ]
+            [ linearize-basic-blocks ] bi
+        ] with-scope
+    ] [ word>> ] [ label>> ] tri <mr> ;
diff --git a/unfinished/compiler/cfg/rpo/rpo.factor b/unfinished/compiler/cfg/rpo/rpo.factor
new file mode 100644
index 0000000000..d5280a8142
--- /dev/null
+++ b/unfinished/compiler/cfg/rpo/rpo.factor
@@ -0,0 +1,21 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel accessors namespaces make math sequences
+compiler.instructions ;
+IN: compiler.cfg.rpo
+
+: post-order-traversal ( basic-block -- )
+    dup visited>> [ drop ] [
+        t >>visited
+        <label> >>label
+        [ successors>> [ post-order-traversal ] each ] [ , ] bi
+    ] if ;
+
+: post-order ( procedure -- blocks )
+    [ post-order-traversal ] { } make ;
+
+: number-blocks ( blocks -- )
+    [ >>number drop ] each-index ;
+
+: reverse-post-order ( procedure -- blocks )
+    post-order <reversed> dup number-blocks ; inline
diff --git a/unfinished/compiler/cfg/stacks/authors.txt b/unfinished/compiler/cfg/stacks/authors.txt
new file mode 100644
index 0000000000..1901f27a24
--- /dev/null
+++ b/unfinished/compiler/cfg/stacks/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
diff --git a/unfinished/compiler/cfg/stacks/stacks.factor b/unfinished/compiler/cfg/stacks/stacks.factor
new file mode 100755
index 0000000000..f2cfbb70a1
--- /dev/null
+++ b/unfinished/compiler/cfg/stacks/stacks.factor
@@ -0,0 +1,389 @@
+! Copyright (C) 2006, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: arrays assocs classes classes.private classes.algebra
+combinators hashtables kernel layouts math fry namespaces
+quotations sequences system vectors words effects alien
+byte-arrays accessors sets math.order compiler.instructions
+compiler.registers ;
+IN: compiler.cfg.stacks
+
+! Converting stack operations into register operations, while
+! doing a bit of optimization along the way.
+
+USE: qualified
+FROM: compiler.generator.registers => +input+   ;
+FROM: compiler.generator.registers => +output+  ;
+FROM: compiler.generator.registers => +scratch+ ;
+FROM: compiler.generator.registers => +clobber+ ;
+SYMBOL: known-tag
+
+! Value protocol
+GENERIC: set-operand-class ( class obj -- )
+GENERIC: operand-class* ( operand -- class )
+GENERIC: move-spec ( obj -- spec )
+GENERIC: live-loc? ( actual current -- ? )
+GENERIC# (lazy-load) 1 ( value spec -- value )
+GENERIC# (eager-load) 1 ( value spec -- value )
+GENERIC: lazy-store ( dst src -- )
+GENERIC: minimal-ds-loc* ( min obj -- min )
+
+! This will be a multimethod soon
+DEFER: %move
+
+PRIVATE>
+
+: operand-class ( operand -- class )
+    operand-class* object or ;
+
+! Default implementation
+M: value set-operand-class 2drop ;
+M: value operand-class* drop f ;
+M: value live-loc? 2drop f ;
+M: value minimal-ds-loc* drop ;
+M: value lazy-store 2drop ;
+
+M: vreg move-spec reg-class>> move-spec ;
+
+M: int-regs move-spec drop f ;
+M: int-regs operand-class* drop object ;
+
+M: float-regs move-spec drop float ;
+M: float-regs operand-class* drop float ;
+
+M: ds-loc minimal-ds-loc* n>> min ;
+M: ds-loc live-loc?
+    over ds-loc? [ [ n>> ] bi@ = not ] [ 2drop t ] if ;
+
+M: rs-loc live-loc?
+    over rs-loc? [ [ n>> ] bi@ = not ] [ 2drop t ] if ;
+
+M: loc operand-class* class>> ;
+M: loc set-operand-class (>>class) ;
+M: loc move-spec drop loc ;
+
+M: f move-spec drop loc ;
+M: f operand-class* ;
+
+M: cached set-operand-class vreg>> set-operand-class ;
+M: cached operand-class* vreg>> operand-class* ;
+M: cached move-spec drop cached ;
+M: cached live-loc? loc>> live-loc? ;
+M: cached (lazy-load) >r vreg>> r> (lazy-load) ;
+M: cached (eager-load) >r vreg>> r> (eager-load) ;
+M: cached lazy-store
+    2dup loc>> live-loc?
+    [ "live-locs" get at %move ] [ 2drop ] if ;
+M: cached minimal-ds-loc* loc>> minimal-ds-loc* ;
+
+M: tagged set-operand-class (>>class) ;
+M: tagged operand-class* class>> ;
+M: tagged move-spec drop f ;
+
+M: unboxed-alien operand-class* drop simple-alien ;
+M: unboxed-alien move-spec class ;
+
+M: unboxed-byte-array operand-class* drop c-ptr ;
+M: unboxed-byte-array move-spec class ;
+
+M: unboxed-f operand-class* drop \ f ;
+M: unboxed-f move-spec class ;
+
+M: unboxed-c-ptr operand-class* drop c-ptr ;
+M: unboxed-c-ptr move-spec class ;
+
+M: constant operand-class* value>> class ;
+M: constant move-spec class ;
+
+! Moving values between locations and registers
+: %move-bug ( -- * ) "Bug in generator.registers" throw ;
+
+: %unbox-c-ptr ( dst src -- )
+    dup operand-class {
+        { [ dup \ f class<= ] [ drop %unbox-f ] }
+        { [ dup simple-alien class<= ] [ drop %unbox-alien ] }
+        { [ dup byte-array class<= ] [ drop %unbox-byte-array ] }
+        [ drop %unbox-any-c-ptr ]
+    } cond ; inline
+
+: %move-via-temp ( dst src -- )
+    #! For many transfers, such as loc to unboxed-alien, we
+    #! don't have an intrinsic, so we transfer the source to
+    #! temp then temp to the destination.
+    int-regs next-vreg [ over %move operand-class ] keep
+    tagged new
+        swap >>vreg
+        swap >>class
+    %move ;
+
+: %move ( dst src -- )
+    2dup [ move-spec ] bi@ 2array {
+        { { f f } [ %copy ] }
+        { { unboxed-alien unboxed-alien } [ %copy ] }
+        { { unboxed-byte-array unboxed-byte-array } [ %copy ] }
+        { { unboxed-f unboxed-f } [ %copy ] }
+        { { unboxed-c-ptr unboxed-c-ptr } [ %copy ] }
+        { { float float } [ %copy-float ] }
+
+        { { f unboxed-c-ptr } [ %move-bug ] }
+        { { f unboxed-byte-array } [ %move-bug ] }
+
+        { { f constant } [ value>> swap %load-literal ] }
+
+        { { f float } [ %box-float ] }
+        { { f unboxed-alien } [ %box-alien ] }
+        { { f loc } [ %peek ] }
+
+        { { float f } [ %unbox-float ] }
+        { { unboxed-alien f } [ %unbox-alien ] }
+        { { unboxed-byte-array f } [ %unbox-byte-array ] }
+        { { unboxed-f f } [ %unbox-f ] }
+        { { unboxed-c-ptr f } [ %unbox-c-ptr ] }
+        { { loc f } [ swap %replace ] }
+
+        [ drop %move-via-temp ]
+    } case ;
+
+! A compile-time stack
+TUPLE: phantom-stack height stack ;
+
+M: phantom-stack clone
+    call-next-method [ clone ] change-stack ;
+
+GENERIC: finalize-height ( stack -- )
+
+: new-phantom-stack ( class -- stack )
+    >r 0 V{ } clone r> boa ; inline
+
+: (loc) ( m stack -- n )
+    #! Utility for methods on <loc>
+    height>> - ;
+
+: (finalize-height) ( stack word -- )
+    #! We consolidate multiple stack height changes until the
+    #! last moment, and we emit the final height changing
+    #! instruction here.
+    '[ dup zero? [ drop ] [ _ execute ] if 0 ] change-height drop ; inline
+
+GENERIC: <loc> ( n stack -- loc )
+
+TUPLE: phantom-datastack < phantom-stack ;
+
+: <phantom-datastack> ( -- stack )
+    phantom-datastack new-phantom-stack ;
+
+M: phantom-datastack <loc> (loc) <ds-loc> ;
+
+M: phantom-datastack finalize-height
+    \ %inc-d (finalize-height) ;
+
+TUPLE: phantom-retainstack < phantom-stack ;
+
+: <phantom-retainstack> ( -- stack )
+    phantom-retainstack new-phantom-stack ;
+
+M: phantom-retainstack <loc> (loc) <rs-loc> ;
+
+M: phantom-retainstack finalize-height
+    \ %inc-r (finalize-height) ;
+
+: phantom-locs ( n phantom -- locs )
+    #! A sequence of n ds-locs or rs-locs indexing the stack.
+    >r <reversed> r> '[ _ <loc> ] map ;
+
+: phantom-locs* ( phantom -- locs )
+    [ stack>> length ] keep phantom-locs ;
+
+: phantoms ( -- phantom phantom )
+    phantom-datastack get phantom-retainstack get ;
+
+: (each-loc) ( phantom quot -- )
+    >r [ phantom-locs* ] [ stack>> ] bi r> 2each ; inline
+
+: each-loc ( quot -- )
+    phantoms 2array swap '[ _ (each-loc) ] each ; inline
+
+: adjust-phantom ( n phantom -- )
+    swap '[ _ + ] change-height drop ;
+
+: cut-phantom ( n phantom -- seq )
+    swap '[ _ cut* swap ] change-stack drop ;
+
+: phantom-append ( seq stack -- )
+    over length over adjust-phantom stack>> push-all ;
+
+: add-locs ( n phantom -- )
+    2dup stack>> length <= [
+        2drop
+    ] [
+        [ phantom-locs ] keep
+        [ stack>> length head-slice* ] keep
+        [ append >vector ] change-stack drop
+    ] if ;
+
+: phantom-input ( n phantom -- seq )
+    2dup add-locs
+    2dup cut-phantom
+    >r >r neg r> adjust-phantom r> ;
+
+: each-phantom ( quot -- ) phantoms rot bi@ ; inline
+
+: finalize-heights ( -- ) [ finalize-height ] each-phantom ;
+
+: (live-locs) ( phantom -- seq )
+    #! Discard locs which haven't moved
+    [ phantom-locs* ] [ stack>> ] bi zip
+    [ live-loc? ] assoc-filter
+    values ;
+
+: live-locs ( -- seq )
+    [ (live-locs) ] each-phantom append prune ;
+
+! Operands holding pointers to freshly-allocated objects which
+! are guaranteed to be in the nursery
+SYMBOL: fresh-objects
+
+: reg-spec>class ( spec -- class )
+    float eq? double-float-regs int-regs ? ;
+
+: alloc-vreg ( spec -- reg )
+    [ reg-spec>class next-vreg ] keep {
+        { f [ <tagged> ] }
+        { unboxed-alien [ <unboxed-alien> ] }
+        { unboxed-byte-array [ <unboxed-byte-array> ] }
+        { unboxed-f [ <unboxed-f> ] }
+        { unboxed-c-ptr [ <unboxed-c-ptr> ] }
+        [ drop ]
+    } case ;
+
+: compatible? ( value spec -- ? )
+    >r move-spec r> {
+        { [ 2dup = ] [ t ] }
+        { [ dup unboxed-c-ptr eq? ] [
+            over { unboxed-byte-array unboxed-alien } member?
+        ] }
+        [ f ]
+    } cond 2nip ;
+
+: alloc-vreg-for ( value spec -- vreg )
+    alloc-vreg swap operand-class
+    over tagged? [ >>class ] [ drop ] if ;
+
+M: value (lazy-load)
+    {
+        { [ dup quotation? ] [ drop ] }
+        { [ 2dup compatible? ] [ drop ] }
+        [ (eager-load) ]
+    } cond ;
+
+M: value (eager-load) ( value spec -- vreg )
+    [ alloc-vreg-for ] [ drop ] 2bi
+    [ %move ] [ drop ] 2bi ;
+
+M: loc lazy-store
+    2dup live-loc? [ "live-locs" get at %move ] [ 2drop ] if ;
+
+: finalize-locs ( -- )
+    #! Perform any deferred stack shuffling.
+    live-locs [ dup f (lazy-load) ] H{ } map>assoc
+    dup assoc-empty? [ drop ] [
+        "live-locs" set [ lazy-store ] each-loc
+    ] if ;
+
+: finalize-vregs ( -- )
+    #! Store any vregs to their final stack locations.
+    [
+        dup loc? over cached? or [ 2drop ] [ %move ] if
+    ] each-loc ;
+
+: reset-phantom ( phantom -- )
+    #! Kill register assignments but preserve constants and
+    #! class information.
+    dup phantom-locs*
+    over stack>> [
+        dup constant? [ nip ] [
+            operand-class over set-operand-class
+        ] if
+    ] 2map
+    over stack>> delete-all
+    swap stack>> push-all ;
+
+: reset-phantoms ( -- )
+    [ reset-phantom ] each-phantom ;
+
+: finalize-contents ( -- )
+    finalize-locs finalize-vregs reset-phantoms ;
+
+! Loading stacks to vregs
+: vreg-substitution ( value vreg -- pair )
+    dupd <cached> 2array ;
+
+: substitute-vreg? ( old new -- ? )
+    #! We don't substitute locs for float or alien vregs,
+    #! since in those cases the boxing overhead might kill us.
+    vreg>> tagged? >r loc? r> and ;
+
+: substitute-vregs ( values vregs -- )
+    [ vreg-substitution ] 2map
+    [ substitute-vreg? ] assoc-filter >hashtable
+    '[ stack>> _ substitute-here ] each-phantom ;
+
+: clear-phantoms ( -- )
+    [ stack>> delete-all ] each-phantom ;
+
+: set-operand-classes ( classes -- )
+    phantom-datastack get
+    over length over add-locs
+    stack>> [ set-operand-class ] 2reverse-each ;
+
+: finalize-phantoms ( -- )
+    #! Commit all deferred stacking shuffling, and ensure the
+    #! in-memory data and retain stacks are up to date with
+    #! respect to the compiler's current picture.
+    finalize-contents
+    clear-phantoms
+    finalize-heights
+    fresh-objects get [ empty? [ %gc ] unless ] [ delete-all ] bi ;
+
+: fresh-object ( obj -- ) fresh-objects get push ;
+
+: fresh-object? ( obj -- ? ) fresh-objects get memq? ;
+
+: init-phantoms ( -- )
+    V{ } clone fresh-objects set
+    <phantom-datastack> phantom-datastack set
+    <phantom-retainstack> phantom-retainstack set ;
+
+: copy-phantoms ( -- )
+    fresh-objects [ clone ] change
+    phantom-datastack [ clone ] change
+    phantom-retainstack [ clone ] change ;
+
+: operand-tag ( operand -- tag/f )
+    operand-class dup [ class-tag ] when ;
+
+UNION: immediate fixnum POSTPONE: f ;
+
+: operand-immediate? ( operand -- ? )
+    operand-class immediate class<= ;
+
+: phantom-push ( obj -- )
+    1 phantom-datastack get adjust-phantom
+    phantom-datastack get stack>> push ;
+
+: phantom-shuffle ( shuffle -- )
+    [ in>> length phantom-datastack get phantom-input ] keep
+    shuffle phantom-datastack get phantom-append ;
+
+: phantom->r ( n -- )
+    phantom-datastack get phantom-input
+    phantom-retainstack get phantom-append ;
+
+: phantom-r> ( n -- )
+    phantom-retainstack get phantom-input
+    phantom-datastack get phantom-append ;
+
+: phantom-drop ( n -- )
+    phantom-datastack get phantom-input drop ;
+
+: phantom-rdrop ( n -- )
+    phantom-retainstack get phantom-input drop ;
diff --git a/unfinished/compiler/cfg/templates/templates.factor b/unfinished/compiler/cfg/templates/templates.factor
new file mode 100644
index 0000000000..798e1fd563
--- /dev/null
+++ b/unfinished/compiler/cfg/templates/templates.factor
@@ -0,0 +1,103 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: assocs accessors sequences kernel fry namespaces
+quotations combinators classes.algebra compiler.instructions
+compiler.registers compiler.cfg.stacks ;
+IN: compiler.cfg.templates
+
+USE: qualified
+FROM: compiler.generator.registers => +input+   ;
+FROM: compiler.generator.registers => +output+  ;
+FROM: compiler.generator.registers => +scratch+ ;
+FROM: compiler.generator.registers => +clobber+ ;
+
+: template-input +input+ swap at ; inline
+: template-output +output+ swap at ; inline
+: template-scratch +scratch+ swap at ; inline
+: template-clobber +clobber+ swap at ; inline
+
+: phantom&spec ( phantom specs -- phantom' specs' )
+    >r stack>> r>
+    [ length f pad-left ] keep
+    [ <reversed> ] bi@ ; inline
+
+: phantom&spec-agree? ( phantom spec quot -- ? )
+    >r phantom&spec r> 2all? ; inline
+
+: live-vregs ( -- seq )
+    [ stack>> [ >vreg ] map sift ] each-phantom append ;
+
+: clobbered ( template -- seq )
+    [ template-output ] [ template-clobber ] bi append ;
+
+: clobbered? ( value name -- ? )
+    \ clobbered get member? [
+        >vreg \ live-vregs get member?
+    ] [ drop f ] if ;
+
+: lazy-load ( specs -- seq )
+    [ length phantom-datastack get phantom-input ] keep
+    [ drop ] [
+        [
+            2dup second clobbered?
+            [ first (eager-load) ] [ first (lazy-load) ] if
+        ] 2map
+    ] 2bi
+    [ substitute-vregs ] keep ;
+
+: load-inputs ( template -- assoc )
+    [
+        live-vregs \ live-vregs set
+        dup clobbered \ clobbered set
+        template-input [ values ] [ lazy-load ] bi zip
+    ] with-scope ;
+
+: alloc-scratch ( template -- assoc )
+    template-scratch [ swap alloc-vreg ] assoc-map ;
+
+: do-template-inputs ( template -- inputs )
+    #! Load input values into registers and allocates scratch
+    #! registers.
+    [ load-inputs ] [ alloc-scratch ] bi assoc-union ;
+
+: do-template-outputs ( template inputs -- )
+    [ template-output ] dip '[ _ at ] map
+    phantom-datastack get phantom-append ;
+
+: apply-template ( pair quot -- vregs )
+    [
+        first2 dup do-template-inputs
+        [ do-template-outputs ] keep
+    ] dip call ; inline
+
+: value-matches? ( value spec -- ? )
+    #! If the spec is a quotation and the value is a literal
+    #! fixnum, see if the quotation yields true when applied
+    #! to the fixnum. Otherwise, the values don't match. If the
+    #! spec is not a quotation, its a reg-class, in which case
+    #! the value is always good.
+    dup quotation? [
+        over constant?
+        [ >r value>> r> 2drop f ] [ 2drop f ] if
+    ] [
+        2drop t
+    ] if ;
+
+: class-matches? ( actual expected -- ? )
+    {
+        { f [ drop t ] }
+        { known-tag [ dup [ class-tag >boolean ] when ] }
+        [ class<= ]
+    } case ;
+
+: spec-matches? ( value spec -- ? )
+    2dup first value-matches?
+    >r >r operand-class 2 r> ?nth class-matches? r> and ;
+
+: template-matches? ( template -- ? )
+    template-input phantom-datastack get swap
+    [ spec-matches? ] phantom&spec-agree? ;
+
+: find-template ( templates -- pair/f )
+    #! Pair has shape { quot assoc }
+    [ second template-matches? ] find nip ;
diff --git a/unfinished/compiler/codegen/fixup/authors.txt b/unfinished/compiler/codegen/fixup/authors.txt
new file mode 100644
index 0000000000..1901f27a24
--- /dev/null
+++ b/unfinished/compiler/codegen/fixup/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
diff --git a/unfinished/compiler/codegen/fixup/fixup.factor b/unfinished/compiler/codegen/fixup/fixup.factor
new file mode 100755
index 0000000000..1f1cf81cb9
--- /dev/null
+++ b/unfinished/compiler/codegen/fixup/fixup.factor
@@ -0,0 +1,154 @@
+! Copyright (C) 2007, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: arrays byte-arrays generic assocs hashtables io.binary
+kernel kernel.private math namespaces make sequences words
+quotations strings alien.accessors alien.strings layouts system
+combinators math.bitwise words.private cpu.architecture
+math.order accessors growable ;
+IN: compiler.cfg.fixup
+
+: no-stack-frame -1 ; inline
+
+TUPLE: frame-required n ;
+
+: frame-required ( n -- ) \ frame-required boa , ;
+
+: stack-frame-size ( code -- n )
+    no-stack-frame [
+        dup frame-required? [ n>> max ] [ drop ] if
+    ] reduce ;
+
+GENERIC: fixup* ( frame-size obj -- frame-size )
+
+: code-format 22 getenv ;
+
+: compiled-offset ( -- n ) building get length code-format * ;
+
+TUPLE: label offset ;
+
+: <label> ( -- label ) label new ;
+
+M: label fixup*
+    compiled-offset >>offset drop ;
+
+: define-label ( name -- ) <label> swap set ;
+
+: resolve-label ( label/name -- ) dup label? [ get ] unless , ;
+
+: if-stack-frame ( frame-size quot -- )
+    swap dup no-stack-frame =
+    [ 2drop ] [ stack-frame swap call ] if ; inline
+
+M: word fixup*
+    {
+        { \ %prologue-later [ dup [ %prologue ] if-stack-frame ] }
+        { \ %epilogue-later [ dup [ %epilogue ] if-stack-frame ] }
+    } case ;
+
+SYMBOL: relocation-table
+SYMBOL: label-table
+
+! Relocation classes
+: rc-absolute-cell     0 ;
+: rc-absolute          1 ;
+: rc-relative          2 ;
+: rc-absolute-ppc-2/2  3 ;
+: rc-relative-ppc-2    4 ;
+: rc-relative-ppc-3    5 ;
+: rc-relative-arm-3    6 ;
+: rc-indirect-arm      7 ;
+: rc-indirect-arm-pc   8 ;
+
+: rc-absolute? ( n -- ? )
+    dup rc-absolute-cell =
+    over rc-absolute =
+    rot rc-absolute-ppc-2/2 = or or ;
+
+! Relocation types
+: rt-primitive 0 ;
+: rt-dlsym     1 ;
+: rt-literal   2 ;
+: rt-dispatch  3 ;
+: rt-xt        4 ;
+: rt-here      5 ;
+: rt-label     6 ;
+: rt-immediate 7 ;
+
+TUPLE: label-fixup label class ;
+
+: label-fixup ( label class -- ) \ label-fixup boa , ;
+
+M: label-fixup fixup*
+    dup class>> rc-absolute?
+    [ "Absolute labels not supported" throw ] when
+    dup label>> swap class>> compiled-offset 4 - rot
+    3array label-table get push ;
+
+TUPLE: rel-fixup arg class type ;
+
+: rel-fixup ( arg class type -- ) \ rel-fixup boa , ;
+
+: push-4 ( value vector -- )
+    [ length ] [ B{ 0 0 0 0 } swap push-all ] [ underlying>> ] tri
+    swap set-alien-unsigned-4 ;
+
+M: rel-fixup fixup*
+    [ [ arg>> ] [ class>> ] [ type>> ] tri { 0 8 16 } bitfield ]
+    [ class>> rc-absolute-cell = cell 4 ? compiled-offset swap - ] bi
+    [ relocation-table get push-4 ] bi@ ;
+
+M: frame-required fixup* drop ;
+
+M: integer fixup* , ;
+
+: adjoin* ( obj table -- n )
+    2dup swap [ eq? ] curry find drop
+    [ 2nip ] [ dup length >r push r> ] if* ;
+
+SYMBOL: literal-table
+
+: add-literal ( obj -- n ) literal-table get adjoin* ;
+
+: add-dlsym-literals ( symbol dll -- )
+    >r string>symbol r> 2array literal-table get push-all ;
+
+: rel-dlsym ( name dll class -- )
+    >r literal-table get length >r
+    add-dlsym-literals
+    r> r> rt-dlsym rel-fixup ;
+
+: rel-word ( word class -- )
+    >r add-literal r> rt-xt rel-fixup ;
+
+: rel-primitive ( word class -- )
+    >r def>> first r> rt-primitive rel-fixup ;
+
+: rel-literal ( literal class -- )
+    >r add-literal r> rt-literal rel-fixup ;
+
+: rel-this ( class -- )
+    0 swap rt-label rel-fixup ;
+
+: rel-here ( class -- )
+    0 swap rt-here rel-fixup ;
+
+: init-fixup ( -- )
+    BV{ } clone relocation-table set
+    V{ } clone label-table set ;
+
+: resolve-labels ( labels -- labels' )
+    [
+        first3 offset>>
+        [ "Unresolved label" throw ] unless*
+        3array
+    ] map concat ;
+
+: fixup ( code -- literals relocation labels code )
+    [
+        init-fixup
+        dup stack-frame-size swap [ fixup* ] each drop
+
+        literal-table get >array
+        relocation-table get >byte-array
+        label-table get resolve-labels
+    ] { } make ;
diff --git a/unfinished/compiler/codegen/fixup/summary.txt b/unfinished/compiler/codegen/fixup/summary.txt
new file mode 100644
index 0000000000..ce83e6d253
--- /dev/null
+++ b/unfinished/compiler/codegen/fixup/summary.txt
@@ -0,0 +1 @@
+Support for generation of relocatable code
diff --git a/unfinished/compiler/instructions/instructions.factor b/unfinished/compiler/instructions/instructions.factor
new file mode 100644
index 0000000000..57b3ff51fd
--- /dev/null
+++ b/unfinished/compiler/instructions/instructions.factor
@@ -0,0 +1,96 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: assocs accessors arrays kernel sequences namespaces
+math compiler.instructions.syntax ;
+IN: compiler.instructions
+
+! Virtual CPU instructions, used by CFG and machine IRs
+
+INSN: %cond-branch vreg ;
+INSN: %unary dst src ;
+
+! Stack operations
+INSN: %peek vreg loc ;
+INSN: %replace vreg loc ;
+INSN: %inc-d n ;
+INSN: %inc-r n ;
+INSN: %load-literal obj vreg ;
+
+! Calling convention
+INSN: %return ;
+
+! Subroutine calls
+INSN: %call word ;
+INSN: %jump word ;
+INSN: %intrinsic quot vregs ;
+
+! Jump tables
+INSN: %dispatch-label label ;
+INSN: %dispatch ;
+
+! Boxing and unboxing
+INSN: %copy < %unary ;
+INSN: %copy-float < %unary ;
+INSN: %unbox-float < %unary ;
+INSN: %unbox-f < %unary ;
+INSN: %unbox-alien < %unary ;
+INSN: %unbox-byte-array < %unary ;
+INSN: %unbox-any-c-ptr < %unary ;
+INSN: %box-float < %unary ;
+INSN: %box-alien < %unary ;
+
+INSN: %gc ;
+
+! FFI
+INSN: %alien-invoke params ;
+INSN: %alien-indirect params ;
+INSN: %alien-callback params ;
+
+GENERIC: uses-vregs ( insn -- seq )
+
+M: insn uses-vregs drop f ;
+M: %peek uses-vregs vreg>> 1array ;
+M: %replace uses-vregs vreg>> 1array ;
+M: %load-literal uses-vregs vreg>> 1array ;
+M: %unary uses-vregs [ dst>> ] [ src>> ] bi 2array ;
+M: %intrinsic uses-vregs vregs>> values ;
+
+! Instructions used by CFG IR only.
+INSN: %prologue ;
+INSN: %epilogue ;
+INSN: %frame-required n ;
+
+INSN: %branch ;
+INSN: %branch-f < %cond-branch ;
+INSN: %branch-t < %cond-branch ;
+INSN: %if-intrinsic quot vregs ;
+INSN: %boolean-intrinsic quot vregs out ;
+
+M: %cond-branch uses-vregs vreg>> 1array ;
+M: %if-intrinsic uses-vregs vregs>> values ;
+M: %boolean-intrinsic uses-vregs
+    [ vregs>> values ] [ out>> ] bi suffix ;
+
+! Instructions used by machine IR only.
+INSN: _prologue n ;
+INSN: _epilogue n ;
+
+TUPLE: label id ;
+
+INSN: _label label ;
+
+: <label> ( -- label ) \ <label> counter label boa ;
+: define-label ( name -- ) <label> swap set ;
+
+: resolve-label ( label/name -- )
+    dup label? [ get ] unless _label ;
+
+TUPLE: _cond-branch vreg label ;
+
+INSN: _branch label ;
+INSN: _branch-f < _cond-branch ;
+INSN: _branch-t < _cond-branch ;
+INSN: _if-intrinsic label quot vregs ;
+
+M: _cond-branch uses-vregs vreg>> 1array ;
+M: _if-intrinsic uses-vregs vregs>> values ;
diff --git a/unfinished/compiler/instructions/syntax/syntax.factor b/unfinished/compiler/instructions/syntax/syntax.factor
new file mode 100644
index 0000000000..0a4ffae876
--- /dev/null
+++ b/unfinished/compiler/instructions/syntax/syntax.factor
@@ -0,0 +1,15 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: classes.tuple classes.tuple.parser kernel words
+make parser ;
+IN: compiler.instructions.syntax
+
+TUPLE: insn ;
+
+: INSN:
+    parse-tuple-definition
+    [ dup tuple eq? [ drop insn ] when ] dip
+    [ define-tuple-class ]
+    [ 2drop save-location ]
+    [ 2drop dup [ boa , ] curry define-inline ]
+    3tri ; parsing
diff --git a/unfinished/compiler/lvops/lvops.factor b/unfinished/compiler/lvops.bluesky/lvops.factor
similarity index 100%
rename from unfinished/compiler/lvops/lvops.factor
rename to unfinished/compiler/lvops.bluesky/lvops.factor
diff --git a/unfinished/compiler/machine/builder/builder.factor b/unfinished/compiler/machine.bluesky/builder/builder.factor
similarity index 100%
rename from unfinished/compiler/machine/builder/builder.factor
rename to unfinished/compiler/machine.bluesky/builder/builder.factor
diff --git a/unfinished/compiler/machine/debugger/debugger.factor b/unfinished/compiler/machine.bluesky/debugger/debugger.factor
similarity index 100%
rename from unfinished/compiler/machine/debugger/debugger.factor
rename to unfinished/compiler/machine.bluesky/debugger/debugger.factor
diff --git a/unfinished/compiler/machine/simplifier/simplifier.factor b/unfinished/compiler/machine.bluesky/simplifier/simplifier.factor
similarity index 100%
rename from unfinished/compiler/machine/simplifier/simplifier.factor
rename to unfinished/compiler/machine.bluesky/simplifier/simplifier.factor
diff --git a/unfinished/compiler/registers/registers.factor b/unfinished/compiler/registers/registers.factor
new file mode 100644
index 0000000000..6087064c80
--- /dev/null
+++ b/unfinished/compiler/registers/registers.factor
@@ -0,0 +1,90 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors namespaces math kernel ;
+IN: compiler.registers
+
+! Virtual CPU registers, used by CFG and machine IRs
+
+MIXIN: value
+
+GENERIC: >vreg ( obj -- vreg )
+
+M: value >vreg drop f ;
+
+! Register classes
+SINGLETON: int-regs
+SINGLETON: single-float-regs
+SINGLETON: double-float-regs
+UNION: float-regs single-float-regs double-float-regs ;
+UNION: reg-class int-regs float-regs ;
+
+! Virtual registers
+TUPLE: vreg reg-class n ;
+SYMBOL: vreg-counter
+: next-vreg ( reg-class -- vreg ) \ vreg-counter counter vreg boa ;
+
+M: vreg >vreg ;
+
+INSTANCE: vreg value
+
+! Stack locations
+TUPLE: loc n class ;
+
+! A data stack location.
+TUPLE: ds-loc < loc ;
+: <ds-loc> ( n -- loc ) f ds-loc boa ;
+
+TUPLE: rs-loc < loc ;
+: <rs-loc> ( n -- loc ) f rs-loc boa ;
+
+INSTANCE: loc value
+
+! A stack location which has been loaded into a register. To
+! read the location, we just read the register, but when time
+! comes to save it back to the stack, we know the register just
+! contains a stack value so we don't have to redundantly write
+! it back.
+TUPLE: cached loc vreg ;
+C: <cached> cached
+
+M: cached >vreg vreg>> >vreg ;
+
+INSTANCE: cached value
+
+! A tagged pointer
+TUPLE: tagged vreg class ;
+: <tagged> ( vreg -- tagged ) f tagged boa ;
+
+M: tagged >vreg vreg>> ;
+
+INSTANCE: tagged value
+
+! Unboxed value
+TUPLE: unboxed vreg ;
+C: <unboxed> unboxed
+
+M: unboxed >vreg vreg>> ;
+
+INSTANCE: unboxed value
+
+! Unboxed alien pointer
+TUPLE: unboxed-alien < unboxed ;
+C: <unboxed-alien> unboxed-alien
+
+! Untagged byte array pointer
+TUPLE: unboxed-byte-array < unboxed ;
+C: <unboxed-byte-array> unboxed-byte-array
+
+! A register set to f
+TUPLE: unboxed-f < unboxed ;
+C: <unboxed-f> unboxed-f
+
+! An alien, byte array or f
+TUPLE: unboxed-c-ptr < unboxed ;
+C: <unboxed-c-ptr> unboxed-c-ptr
+
+! A constant value
+TUPLE: constant value ;
+C: <constant> constant
+
+INSTANCE: constant value
diff --git a/unfinished/compiler/vops/builder/builder.factor b/unfinished/compiler/vops.bluesky/builder/builder.factor
similarity index 100%
rename from unfinished/compiler/vops/builder/builder.factor
rename to unfinished/compiler/vops.bluesky/builder/builder.factor
diff --git a/unfinished/compiler/vops/vops.factor b/unfinished/compiler/vops.bluesky/vops.factor
similarity index 100%
rename from unfinished/compiler/vops/vops.factor
rename to unfinished/compiler/vops.bluesky/vops.factor
diff --git a/unmaintained/ogg/player/player.factor b/unmaintained/ogg/player/player.factor
index 251206f1d1..2204aa441e 100755
--- a/unmaintained/ogg/player/player.factor
+++ b/unmaintained/ogg/player/player.factor
@@ -15,7 +15,7 @@ USING: kernel alien ogg ogg.vorbis ogg.theora io byte-arrays
        namespaces threads shuffle opengl arrays ui.gadgets.worlds
        combinators math.parser ui.gadgets ui.render opengl.gl ui
        continuations io.files hints combinators.lib sequences.lib
-       io.encodings.binary debugger math.order ;
+       io.encodings.binary debugger math.order accessors ;
 
 IN: ogg.player
 
@@ -30,62 +30,63 @@ TUPLE: player stream temp-state
        gadget ;
 
 : init-vorbis ( player -- )
-    dup player-oy ogg_sync_init drop
-    dup player-vi vorbis_info_init
-    player-vc vorbis_comment_init ;
+    dup oy>> ogg_sync_init drop
+    dup vi>> vorbis_info_init
+    vc>> vorbis_comment_init ;
 
 : init-theora ( player -- )
-    dup player-ti theora_info_init
-    player-tc theora_comment_init ;
+    dup ti>> theora_info_init
+    tc>> theora_comment_init ;
 
 : init-sound ( player -- )
     init-openal check-error
-    1 gen-buffers check-error over set-player-buffers
-    2 "uint" <c-array> over set-player-buffer-indexes
-    1 gen-sources check-error first swap set-player-source ;
+    1 gen-buffers check-error >>buffers
+    2 "uint" <c-array> >>buffer-indexes
+    1 gen-sources check-error first >>source drop ;
 
 : <player> ( stream -- player )
-    { set-player-stream } player construct
-    0 over set-player-vorbis
-    0 over set-player-theora
-    0 over set-player-video-time
-    0 over set-player-video-granulepos
-    f over set-player-video-ready?
-    f over set-player-audio-full?
-    0 over set-player-audio-index
-    0 over set-player-start-time
-    audio-buffer-size "short" <c-array> over set-player-audio-buffer
-    0 over set-player-audio-granulepos
-    f over set-player-playing?
-    "ogg_packet" malloc-object over set-player-op
-    "ogg_sync_state" malloc-object over set-player-oy
-    "ogg_page" malloc-object over set-player-og
-    "ogg_stream_state" malloc-object over set-player-vo
-    "vorbis_info" malloc-object over set-player-vi
-    "vorbis_dsp_state" malloc-object over set-player-vd
-    "vorbis_block" malloc-object over set-player-vb
-    "vorbis_comment" malloc-object over set-player-vc
-    "ogg_stream_state" malloc-object over set-player-to
-    "theora_info" malloc-object over set-player-ti
-    "theora_comment" malloc-object over set-player-tc
-    "theora_state" malloc-object over set-player-td
-    "yuv_buffer" <c-object> over set-player-yuv
-    "ogg_stream_state" <c-object> over set-player-temp-state
-    dup init-sound
-    dup init-vorbis
-    dup init-theora ;
+    player new
+        swap >>stream
+        0 >>vorbis
+        0 >>theora
+        0 >>video-time
+        0 >>video-granulepos
+        f >>video-ready?
+        f >>audio-full?
+        0 >>audio-index
+        0 >>start-time
+        audio-buffer-size "short" <c-array> >>audio-buffer
+        0 >>audio-granulepos
+        f >>playing?
+        "ogg_packet" malloc-object >>op
+        "ogg_sync_state" malloc-object >>oy
+        "ogg_page" malloc-object >>og
+        "ogg_stream_state" malloc-object >>vo
+        "vorbis_info" malloc-object >>vi
+        "vorbis_dsp_state" malloc-object >>vd
+        "vorbis_block" malloc-object >>vb
+        "vorbis_comment" malloc-object >>vc
+        "ogg_stream_state" malloc-object >>to
+        "theora_info" malloc-object >>ti
+        "theora_comment" malloc-object >>tc
+        "theora_state" malloc-object >>td
+        "yuv_buffer" <c-object> >>yuv
+        "ogg_stream_state" <c-object> >>temp-state
+        dup init-sound
+        dup init-vorbis
+        dup init-theora ;
 
 : num-channels ( player -- channels )
-    player-vi vorbis_info-channels ;
+    vi>> vorbis_info-channels ;
 
 : al-channel-format ( player -- format )
-    num-channels 1 = [ AL_FORMAT_MONO16 ] [ AL_FORMAT_STEREO16 ] if ;
+    num-channels 1 = AL_FORMAT_MONO16 AL_FORMAT_STEREO16 ? ;
 
 : get-time ( player -- time )
-    dup player-start-time zero? [
-        millis over set-player-start-time
+    dup start-time>> zero? [
+        millis >>start-time
     ] when
-    player-start-time millis swap - 1000.0 /f ;
+    start-time>> millis swap - 1000.0 /f ;
 
 : clamp ( n -- n )
     255 min 0 max ; inline
@@ -138,7 +139,7 @@ TUPLE: player stream temp-state
     pick yuv_buffer-y_width >fixnum
     [ yuv>rgb-pixel ] each-with4 ; inline
 
-: yuv>rgb ( rgb yuv  -- )
+: yuv>rgb ( rgb yuv -- )
     0 -rot
     dup yuv_buffer-y_height >fixnum
     [ yuv>rgb-row ] each-with2
@@ -147,52 +148,55 @@ TUPLE: player stream temp-state
 HINTS: yuv>rgb byte-array byte-array ;
 
 : process-video ( player -- player )
-    dup player-gadget [
-        dup { player-td player-yuv } get-slots theora_decode_YUVout drop
-        dup player-rgb over player-yuv yuv>rgb
-        dup player-gadget relayout-1 yield
+    dup gadget>> [
+        {
+            [ [ td>> ] [ yuv>> ] bi theora_decode_YUVout drop ]
+            [ [ rgb>> ] [ yuv>> ] bi yuv>rgb ]
+            [ gadget>> relayout-1 yield ]
+            [ ]
+        } cleave
     ] when ;
 
 : num-audio-buffers-processed ( player -- player n )
-    dup player-source AL_BUFFERS_PROCESSED 0 <uint>
+    dup source>> AL_BUFFERS_PROCESSED 0 <uint>
     [ alGetSourcei check-error ] keep *uint ;
 
 : append-new-audio-buffer ( player -- player )
-    dup player-buffers 1 gen-buffers append over set-player-buffers
-    [ [ player-buffers second ] keep al-channel-format ] keep
-    [ player-audio-buffer dup length  ] keep
-    [ player-vi vorbis_info-rate alBufferData check-error ]  keep
-    [ player-source 1 ] keep
-    [ player-buffers second <uint> alSourceQueueBuffers check-error ] keep ;
+    dup buffers>> 1 gen-buffers append >>buffers
+    [ [ buffers>> second ] keep al-channel-format ] keep
+    [ audio-buffer>> dup length  ] keep
+    [ vi>> vorbis_info-rate alBufferData check-error ]  keep
+    [ source>> 1 ] keep
+    [ buffers>> second <uint> alSourceQueueBuffers check-error ] keep ;
 
 : fill-processed-audio-buffer ( player n -- player )
     #! n is the number of audio buffers processed
-    over >r >r dup player-source r> pick player-buffer-indexes
+    over >r >r dup source>> r> pick buffer-indexes>>
     [ alSourceUnqueueBuffers check-error ] keep
     *uint dup r> swap >r al-channel-format rot
-    [ player-audio-buffer dup length  ] keep
-    [ player-vi vorbis_info-rate alBufferData check-error ]  keep
-    [ player-source 1 ] keep
+    [ audio-buffer>> dup length  ] keep
+    [ vi>> vorbis_info-rate alBufferData check-error ]  keep
+    [ source>> 1 ] keep
     r> <uint> swap >r alSourceQueueBuffers check-error r> ;
 
 : append-audio ( player -- player bool )
     num-audio-buffers-processed {
-        { [ over player-buffers length 1 = over zero? and ] [ drop append-new-audio-buffer t ] }
-        { [ over player-buffers length 2 = over zero? and ] [ yield drop f ] }
+        { [ over buffers>> length 1 = over zero? and ] [ drop append-new-audio-buffer t ] }
+        { [ over buffers>> length 2 = over zero? and ] [ yield drop f ] }
         [ fill-processed-audio-buffer t ]
     } cond ;
 
 : start-audio ( player -- player bool )
-    [ [ player-buffers first ] keep al-channel-format ] keep
-    [ player-audio-buffer dup length ] keep
-    [ player-vi vorbis_info-rate alBufferData check-error ]  keep
-    [ player-source 1 ] keep
-    [ player-buffers first <uint> alSourceQueueBuffers check-error ] keep
-    [ player-source alSourcePlay check-error ] keep
-    t over set-player-playing? t ;
+    [ [ buffers>> first ] keep al-channel-format ] keep
+    [ audio-buffer>> dup length ] keep
+    [ vi>> vorbis_info-rate alBufferData check-error ]  keep
+    [ source>> 1 ] keep
+    [ buffers>> first <uint> alSourceQueueBuffers check-error ] keep
+    [ source>> alSourcePlay check-error ] keep
+    t >>playing? t ;
 
 : process-audio ( player -- player bool )
-    dup player-playing? [ append-audio ] [ start-audio ] if ;
+    dup playing?>> [ append-audio ] [ start-audio ] if ;
 
 : read-bytes-into ( dest size stream -- len )
     #! Read the given number of bytes from a stream
@@ -206,13 +210,13 @@ HINTS: yuv>rgb byte-array byte-array ;
     4096 ; inline
 
 : sync-buffer ( player -- buffer size player )
-    [ player-oy buffer-size ogg_sync_buffer buffer-size ] keep ;
+    [ oy>> buffer-size ogg_sync_buffer buffer-size ] keep ;
 
 : stream-into-buffer ( buffer size player -- len player )
-    [ player-stream read-bytes-into ] keep ;
+    [ stream>> read-bytes-into ] keep ;
 
 : confirm-buffer ( len player -- player eof? )
-  [ player-oy swap ogg_sync_wrote check-not-negative ] 2keep swap zero? ;
+  [ oy>> swap ogg_sync_wrote check-not-negative ] 2keep swap zero? ;
 
 : buffer-data ( player -- player eof? )
     #! Take some compressed bitstream data and sync it for
@@ -221,59 +225,60 @@ HINTS: yuv>rgb byte-array byte-array ;
 
 : queue-page ( player -- player )
     #! Push a page into the stream for packetization
-    [ { player-vo player-og } get-slots ogg_stream_pagein drop ] keep
-    [ { player-to player-og } get-slots ogg_stream_pagein drop ] keep ;
+    [ [ vo>> ] [ og>> ] bi ogg_stream_pagein drop ]
+    [ [ to>> ] [ og>> ] bi ogg_stream_pagein drop ]
+    [ ] tri ;
 
 : retrieve-page ( player -- player bool )
     #! Sync the streams and get a page. Return true if a page was
     #! successfully retrieved.
-    dup { player-oy player-og } get-slots ogg_sync_pageout 0 > ;
+    dup [ oy>> ] [ og>> ] bi ogg_sync_pageout 0 > ;
 
 : standard-initial-header? ( player -- player bool )
-    dup player-og ogg_page_bos zero? not ;
+    dup og>> ogg_page_bos zero? not ;
 
 : ogg-stream-init ( player -- state player )
     #! Init the encode/decode logical stream state
-    [ player-temp-state ] keep
-    [ player-og ogg_page_serialno ogg_stream_init check-not-negative ] 2keep ;
+    [ temp-state>> ] keep
+    [ og>> ogg_page_serialno ogg_stream_init check-not-negative ] 2keep ;
 
 : ogg-stream-pagein ( state player -- state player )
     #! Add the incoming page to the stream state
-    [ player-og ogg_stream_pagein drop ] 2keep ;
+    [ og>> ogg_stream_pagein drop ] 2keep ;
 
 : ogg-stream-packetout ( state player -- state player )
-    [ player-op ogg_stream_packetout drop ] 2keep ;
+    [ op>> ogg_stream_packetout drop ] 2keep ;
 
 : decode-packet ( player -- state player )
     ogg-stream-init ogg-stream-pagein ogg-stream-packetout ;
 
 : theora-header? ( player -- player bool )
     #! Is the current page a theora header?
-    dup { player-ti player-tc player-op } get-slots theora_decode_header 0 >= ;
+    dup [ ti>> ] [ tc>> ] [ op>> ] tri theora_decode_header 0 >= ;
 
 : is-theora-packet? ( player -- player bool )
-    dup player-theora zero? [ theora-header? ] [ f ] if ;
+    dup theora>> zero? [ theora-header? ] [ f ] if ;
 
 : copy-to-theora-state ( state player -- player )
     #! Copy the state to the theora state structure in the player
-    [ player-to swap dup length memcpy ] keep ;
+    [ to>> swap dup length memcpy ] keep ;
 
 : handle-initial-theora-header ( state player -- player )
-    copy-to-theora-state 1 over set-player-theora ;
+    copy-to-theora-state 1 >>theora ;
 
 : vorbis-header? ( player -- player bool )
     #! Is the current page a vorbis header?
-    dup { player-vi player-vc player-op } get-slots vorbis_synthesis_headerin 0 >= ;
+    dup [ vi>> ] [ vc>> ] [ op>> ] tri vorbis_synthesis_headerin 0 >= ;
 
 : is-vorbis-packet? ( player -- player bool )
-    dup player-vorbis zero? [ vorbis-header? ] [ f ] if ;
+    dup vorbis>> zero? [ vorbis-header? ] [ f ] if ;
 
 : copy-to-vorbis-state ( state player -- player )
     #! Copy the state to the vorbis state structure in the player
-    [ player-vo swap dup length memcpy ] keep ;
+    [ vo>> swap dup length memcpy ] keep ;
 
 : handle-initial-vorbis-header ( state player -- player )
-    copy-to-vorbis-state 1 over set-player-vorbis ;
+    copy-to-vorbis-state 1 >>vorbis ;
 
 : handle-initial-unknown-header ( state player -- player )
     swap ogg_stream_clear drop ;
@@ -308,43 +313,43 @@ HINTS: yuv>rgb byte-array byte-array ;
     #! Return true if we need to decode vorbis due to there being
     #! vorbis headers read from the stream but we don't have them all
     #! yet.
-    dup player-vorbis 1 2 between? not ;
+    dup vorbis>> 1 2 between? not ;
 
 : have-required-theora-headers? ( player -- player bool )
     #! Return true if we need to decode theora due to there being
     #! theora headers read from the stream but we don't have them all
     #! yet.
-    dup player-theora 1 2 between? not ;
+    dup theora>> 1 2 between? not ;
 
 : get-remaining-vorbis-header-packet ( player -- player bool )
-    dup { player-vo player-op } get-slots ogg_stream_packetout {
+    dup [ vo>> ] [ op>> ] bi ogg_stream_packetout {
         { [ dup 0 <   ] [ "Error parsing vorbis stream; corrupt stream?" throw ] }
         { [ dup zero? ] [ drop f ] }
         { [ t     ] [ drop t ] }
     } cond ;
 
 : get-remaining-theora-header-packet ( player -- player bool )
-    dup { player-to player-op } get-slots ogg_stream_packetout {
+    dup [ to>> ] [ op>> ] bi ogg_stream_packetout {
         { [ dup 0 <   ] [ "Error parsing theora stream; corrupt stream?" throw ] }
         { [ dup zero? ] [ drop f ] }
         { [ t     ] [ drop t ] }
     } cond ;
 
 : decode-remaining-vorbis-header-packet ( player -- player )
-    dup { player-vi player-vc player-op } get-slots vorbis_synthesis_headerin zero? [
+    dup [ vi>> ] [ vc>> ] [ op>> ] tri vorbis_synthesis_headerin zero? [
         "Error parsing vorbis stream; corrupt stream?" throw
     ] unless ;
 
 : decode-remaining-theora-header-packet ( player -- player )
-    dup { player-ti player-tc player-op } get-slots theora_decode_header zero? [
+    dup [ ti>> ] [ tc>> ] [ op>> ] tri theora_decode_header zero? [
         "Error parsing theora stream; corrupt stream?" throw
     ] unless ;
 
 : increment-vorbis-header-count ( player -- player )
-    dup player-vorbis 1+ over set-player-vorbis ;
+    [ 1+ ] change-vorbis ;
 
 : increment-theora-header-count ( player -- player )
-    dup player-theora 1+ over set-player-theora ;
+    [ 1+ ] change-theora ;
 
 : parse-remaining-vorbis-headers ( player -- player )
     have-required-vorbis-headers? not [
@@ -376,51 +381,51 @@ HINTS: yuv>rgb byte-array byte-array ;
     ] when ;
 
 : tear-down-vorbis ( player -- player )
-    dup player-vi vorbis_info_clear
-    dup player-vc vorbis_comment_clear ;
+    dup vi>> vorbis_info_clear
+    dup vc>> vorbis_comment_clear ;
 
 : tear-down-theora ( player -- player )
-    dup player-ti theora_info_clear
-    dup player-tc theora_comment_clear ;
+    dup ti>> theora_info_clear
+    dup tc>> theora_comment_clear ;
 
 : init-vorbis-codec ( player -- player )
-    dup { player-vd player-vi } get-slots vorbis_synthesis_init drop
-    dup { player-vd player-vb } get-slots vorbis_block_init drop ;
+    dup [ vd>> ] [ vi>> ] bi vorbis_synthesis_init drop
+    dup [ vd>> ] [ vb>> ] bi vorbis_block_init drop ;
 
 : init-theora-codec ( player -- player )
-    dup { player-td player-ti } get-slots theora_decode_init drop
-    dup player-ti theora_info-frame_width over player-ti theora_info-frame_height
-    4 * * <byte-array> over set-player-rgb ;
+    dup [ td>> ] [ ti>> ] bi theora_decode_init drop
+    dup ti>> theora_info-frame_width over ti>> theora_info-frame_height
+    4 * * <byte-array> >>rgb ;
 
 
 : display-vorbis-details ( player -- player )
     [
         "Ogg logical stream " %
-        dup player-vo ogg_stream_state-serialno #
+        dup vo>> ogg_stream_state-serialno #
         " is Vorbis " %
-        dup player-vi vorbis_info-channels #
+        dup vi>> vorbis_info-channels #
         " channel " %
-        dup player-vi vorbis_info-rate #
+        dup vi>> vorbis_info-rate #
         " Hz audio." %
     ] "" make print ;
 
 : display-theora-details ( player -- player )
     [
         "Ogg logical stream " %
-        dup player-to ogg_stream_state-serialno #
+        dup to>> ogg_stream_state-serialno #
         " is Theora " %
-        dup player-ti theora_info-width #
+        dup ti>> theora_info-width #
         "x" %
-        dup player-ti theora_info-height #
+        dup ti>> theora_info-height #
         " " %
-        dup player-ti theora_info-fps_numerator
-        over player-ti theora_info-fps_denominator /f #
+        dup ti>> theora_info-fps_numerator
+        over ti>> theora_info-fps_denominator /f #
         " fps video" %
     ] "" make print ;
 
 : initialize-decoder ( player -- player )
-    dup player-vorbis zero? [ tear-down-vorbis ] [ init-vorbis-codec display-vorbis-details ] if
-    dup player-theora zero? [ tear-down-theora ] [ init-theora-codec display-theora-details ] if ;
+    dup vorbis>> zero? [ tear-down-vorbis ] [ init-vorbis-codec display-vorbis-details ] if
+    dup theora>> zero? [ tear-down-theora ] [ init-theora-codec display-theora-details ] if ;
 
 : sync-pages ( player -- player )
     retrieve-page [
@@ -428,13 +433,13 @@ HINTS: yuv>rgb byte-array byte-array ;
     ] when ;
 
 : audio-buffer-not-ready? ( player -- player bool )
-    dup player-vorbis zero? not over player-audio-full? not and ;
+    dup vorbis>> zero? not over audio-full?>> not and ;
 
 : pending-decoded-audio? ( player -- player pcm len bool )
-    f <void*> 2dup >r player-vd r> vorbis_synthesis_pcmout dup 0 > ;
+    f <void*> 2dup >r vd>> r> vorbis_synthesis_pcmout dup 0 > ;
 
 : buffer-space-available ( player -- available )
-    audio-buffer-size swap player-audio-index - ;
+    audio-buffer-size swap audio-index>> - ;
 
 : samples-to-read ( player available len -- numread )
     >r swap num-channels / r> min ;
@@ -442,8 +447,8 @@ HINTS: yuv>rgb byte-array byte-array ;
 : each-with3 ( obj obj obj seq quot -- ) 3 each-withn ; inline
 
 : add-to-buffer ( player val -- )
-    over player-audio-index pick player-audio-buffer set-short-nth
-    dup player-audio-index 1+ swap set-player-audio-index ;
+    over audio-index>> pick audio-buffer>> set-short-nth
+    [ 1+ ] change-audio-index drop ;
 
 : get-audio-value ( pcm sample channel -- value )
     rot *void* void*-nth float-nth ;
@@ -462,24 +467,24 @@ HINTS: yuv>rgb byte-array byte-array ;
     pick [ buffer-space-available swap ] keep -rot samples-to-read
     pick over >r >r process-samples r> r> swap
     ! numread player
-    dup player-audio-index audio-buffer-size = [
-        t over set-player-audio-full?
+    dup audio-index>> audio-buffer-size = [
+        t >>audio-full?
     ] when
-    dup player-vd vorbis_dsp_state-granulepos dup 0 >= [
+    dup vd>> vorbis_dsp_state-granulepos dup 0 >= [
         ! numtoread player granulepos
         #! This is wrong: fix
-        pick - over set-player-audio-granulepos
+        pick - >>audio-granulepos
     ] [
         ! numtoread player granulepos
-        pick + over set-player-audio-granulepos
+        pick + >>audio-granulepos
     ] if
-    [ player-vd swap vorbis_synthesis_read drop ] keep ;
+    [ vd>> swap vorbis_synthesis_read drop ] keep ;
 
 : no-pending-audio ( player -- player bool )
     #! No pending audio. Is there a pending packet to decode.
-    dup { player-vo player-op } get-slots ogg_stream_packetout 0 > [
-        dup { player-vb player-op } get-slots vorbis_synthesis 0 = [
-            dup { player-vd player-vb } get-slots vorbis_synthesis_blockin drop
+    dup [ vo>> ] [ op>> ] bi ogg_stream_packetout 0 > [
+        dup [ vb>> ] [ op>> ] bi vorbis_synthesis 0 = [
+            dup [ vd>> ] [ vb>> ] bi vorbis_synthesis_blockin drop
         ] when
         t
     ] [
@@ -498,16 +503,16 @@ HINTS: yuv>rgb byte-array byte-array ;
     ] when ;
 
 : video-buffer-not-ready? ( player -- player bool )
-    dup player-theora zero? not over player-video-ready? not and ;
+    dup theora>> zero? not over video-ready?>> not and ;
 
 : decode-video ( player -- player )
     video-buffer-not-ready? [
-        dup { player-to player-op } get-slots ogg_stream_packetout 0 > [
-            dup { player-td player-op } get-slots theora_decode_packetin drop
-            dup player-td theora_state-granulepos over set-player-video-granulepos
-            dup { player-td player-video-granulepos } get-slots theora_granule_time
-            over set-player-video-time
-            t over set-player-video-ready?
+        dup [ to>> ] [ op>> ] bi ogg_stream_packetout 0 > [
+            dup [ td>> ] [ op>> ] bi theora_decode_packetin drop
+            dup td>> theora_state-granulepos >>video-granulepos
+            dup [ td>> ] [ video-granulepos>> ] bi theora_granule_time
+            >>video-time
+            t >>video-ready?
             decode-video
         ] when
     ] when ;
@@ -516,16 +521,16 @@ HINTS: yuv>rgb byte-array byte-array ;
     get-more-header-data sync-pages
     decode-audio
     decode-video
-    dup player-audio-full? [
+    dup audio-full?>> [
         process-audio [
-            f over set-player-audio-full?
-            0 over set-player-audio-index
+            f >>audio-full?
+            0 >>audio-index
         ] when
     ] when
-    dup player-video-ready? [
-        dup player-video-time over get-time - dup 0.0 < [
+    dup video-ready?>> [
+        dup video-time>> over get-time - dup 0.0 < [
             -0.1 > [ process-video ] when
-            f over set-player-video-ready?
+            f >>video-ready?
         ] [
             drop
         ] if
@@ -533,36 +538,39 @@ HINTS: yuv>rgb byte-array byte-array ;
     decode ;
 
 : free-malloced-objects ( player -- player )
-    [ player-op free ] keep
-    [ player-oy free ] keep
-    [ player-og free ] keep
-    [ player-vo free ] keep
-    [ player-vi free ] keep
-    [ player-vd free ] keep
-    [ player-vb free ] keep
-    [ player-vc free ] keep
-    [ player-to free ] keep
-    [ player-ti free ] keep
-    [ player-tc free ] keep
-    [ player-td free ] keep ;
+    {
+        [ op>> free ]
+        [ oy>> free ]
+        [ og>> free ]
+        [ vo>> free ]
+        [ vi>> free ]
+        [ vd>> free ]
+        [ vb>> free ]
+        [ vc>> free ]
+        [ to>> free ]
+        [ ti>> free ]
+        [ tc>> free ]
+        [ td>> free ]
+        [ ]
+    } cleave ;
 
 
 : unqueue-openal-buffers ( player -- player )
     [
 
-        num-audio-buffers-processed over player-source rot player-buffer-indexes swapd
+        num-audio-buffers-processed over source>> rot buffer-indexes>> swapd
         alSourceUnqueueBuffers check-error
     ] keep ;
 
 : delete-openal-buffers ( player -- player )
     [
-        player-buffers [
+        buffers>> [
             1 swap <uint> alDeleteBuffers check-error
         ] each
     ] keep ;
 
 : delete-openal-source ( player -- player )
-    [ player-source 1 swap <uint> alDeleteSources check-error ] keep ;
+    [ source>> 1 swap <uint> alDeleteSources check-error ] keep ;
 
 : cleanup ( player -- player )
     free-malloced-objects
@@ -572,28 +580,28 @@ HINTS: yuv>rgb byte-array byte-array ;
 
 : wait-for-sound ( player -- player )
     #! Waits for the openal to finish playing remaining sounds
-    dup player-source AL_SOURCE_STATE 0 <int> [ alGetSourcei check-error ] keep
+    dup source>> AL_SOURCE_STATE 0 <int> [ alGetSourcei check-error ] keep
     *int AL_PLAYING = [
         100 sleep
         wait-for-sound
     ] when ;
 
-TUPLE: theora-gadget player ;
+TUPLE: theora-gadget < gadget player ;
 
 : <theora-gadget> ( player -- gadget )
-  theora-gadget construct-gadget
-  [ set-theora-gadget-player ] keep ;
+    theora-gadget new-gadget
+        swap >>player ;
 
 M: theora-gadget pref-dim*
-    theora-gadget-player
-    player-ti dup theora_info-width swap theora_info-height 2array ;
+    player>>
+    ti>> dup theora_info-width swap theora_info-height 2array ;
 
 M: theora-gadget draw-gadget* ( gadget -- )
     0 0 glRasterPos2i
     1.0 -1.0 glPixelZoom
     GL_UNPACK_ALIGNMENT 1 glPixelStorei
     [ pref-dim* first2 GL_RGB GL_UNSIGNED_BYTE ] keep
-    theora-gadget-player player-rgb glDrawPixels ;
+    player>> rgb>> glDrawPixels ;
 
 : initialize-gui ( gadget -- )
     "Theora Player" open-window ;
@@ -602,7 +610,7 @@ M: theora-gadget draw-gadget* ( gadget -- )
     parse-initial-headers
     parse-remaining-headers
     initialize-decoder
-    dup player-gadget [ initialize-gui ] when*
+    dup gadget>> [ initialize-gui ] when*
     [ decode ] try
     wait-for-sound
     cleanup
@@ -616,9 +624,8 @@ M: theora-gadget draw-gadget* ( gadget -- )
 
 : play-theora-stream ( stream -- )
     <player>
-    dup <theora-gadget> over set-player-gadget
+    dup <theora-gadget> >>gadget
     play-ogg ;
 
 : play-theora-file ( filename -- )
     binary <file-reader> play-theora-stream ;
-
diff --git a/unmaintained/space-invaders/resources/invaders.rom b/unmaintained/space-invaders/resources/invaders.rom
deleted file mode 100644
index 606ec01945..0000000000
Binary files a/unmaintained/space-invaders/resources/invaders.rom and /dev/null differ
diff --git a/work/README.txt b/work/README.txt
new file mode 100644
index 0000000000..fd1af07408
--- /dev/null
+++ b/work/README.txt
@@ -0,0 +1 @@
+The 'work' directory is for your own personal vocabularies.