diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor
index 2af7a17560..8d05b14a20 100755
--- a/extra/bunny/model/model.factor
+++ b/extra/bunny/model/model.factor
@@ -12,7 +12,7 @@ IN: bunny.model
     readln [
         numbers {
             { [ dup length 5 = ] [ 3 head pick push ] }
-            { [ dup first 3 = ] [ 1 tail over push ] }
+            { [ dup first 3 = ] [ rest over push ] }
             [ drop ]
         } cond (parse-model)
     ] when* ;
diff --git a/extra/calendar/calendar-tests.factor b/extra/calendar/calendar-tests.factor
index c05d4f60eb..d4cddb6081 100755
--- a/extra/calendar/calendar-tests.factor
+++ b/extra/calendar/calendar-tests.factor
@@ -1,5 +1,5 @@
 USING: arrays calendar kernel math sequences tools.test
-continuations system ;
+continuations system math.order ;
 IN: calendar.tests
 
 \ time+ must-infer
diff --git a/extra/classes/tuple/lib/lib-docs.factor b/extra/classes/tuple/lib/lib-docs.factor
index 34dd181d3b..0c4c11e46f 100644
--- a/extra/classes/tuple/lib/lib-docs.factor
+++ b/extra/classes/tuple/lib/lib-docs.factor
@@ -6,6 +6,7 @@ HELP: >tuple<
 { $description "Explodes the tuple so that tuple slots are on the stack in the order listed in the tuple." }
 { $example
     "USING: kernel prettyprint classes.tuple.lib ;"
+    "IN: scratchpad"
     "TUPLE: foo a b c ;"
     "1 2 3 \\ foo boa \\ foo >tuple< .s"
     "1\n2\n3"
@@ -18,6 +19,7 @@ HELP: >tuple*<
 { $description "Explodes the tuple so that tuple slots ending with '*' are on the stack in the order listed in the tuple." }
 { $example
     "USING: kernel prettyprint classes.tuple.lib ;"
+    "IN: scratchpad"
     "TUPLE: foo a bb* ccc dddd* ;"
     "1 2 3 4 \\ foo boa \\ foo >tuple*< .s"
     "2\n4"
diff --git a/extra/classes/tuple/lib/lib.factor b/extra/classes/tuple/lib/lib.factor
index d48addecc3..10261a1df7 100755
--- a/extra/classes/tuple/lib/lib.factor
+++ b/extra/classes/tuple/lib/lib.factor
@@ -7,7 +7,7 @@ IN: classes.tuple.lib
     [ slot-spec-reader ] map [ get-slots ] curry ;
 
 MACRO: >tuple< ( class -- )
-    all-slots 1 tail-slice reader-slots ;
+    all-slots rest-slice reader-slots ;
 
 MACRO: >tuple*< ( class -- )
     all-slots
diff --git a/extra/cpu/8080/emulator/emulator.factor b/extra/cpu/8080/emulator/emulator.factor
index ecc998e99c..f1af0ef15e 100755
--- a/extra/cpu/8080/emulator/emulator.factor
+++ b/extra/cpu/8080/emulator/emulator.factor
@@ -573,7 +573,7 @@ SYMBOL: $4
   #! $1, $2, etc with the relevant item from the 
   #! given index.
   dup quotation? over [ ] = not and [ ! vector tree
-    dup first swap 1 tail ! vector car cdr
+    dup first swap rest ! vector car cdr
     >r dupd replace-patterns ! vector v R: cdr
     swap r> replace-patterns >r 1quotation r> append
   ] [ ! vector value
diff --git a/extra/crypto/sha1/sha1.factor b/extra/crypto/sha1/sha1.factor
index 37e92db60f..3a74d1f5db 100755
--- a/extra/crypto/sha1/sha1.factor
+++ b/extra/crypto/sha1/sha1.factor
@@ -123,6 +123,6 @@ SYMBOLS: h0 h1 h2 h3 h4 A B C D E w K ;
 
 : byte-array>sha1-interleave ( string -- seq )
     [ zero? ] left-trim
-    dup length odd? [ 1 tail ] when
+    dup length odd? [ rest ] when
     seq>2seq [ byte-array>sha1 ] bi@
     2seq>seq ;
diff --git a/extra/delegate/delegate.factor b/extra/delegate/delegate.factor
index 506d7175b6..0ae8592e66 100755
--- a/extra/delegate/delegate.factor
+++ b/extra/delegate/delegate.factor
@@ -23,7 +23,7 @@ IN: delegate
 
 : forget-old-definitions ( protocol new-wordlist -- )
     >r users-and-words r>
-    diff forget-all-methods ;
+    swap diff forget-all-methods ;
 
 : define-protocol ( protocol wordlist -- )
     ! 2dup forget-old-definitions
diff --git a/extra/faq/faq.factor b/extra/faq/faq.factor
index 8c1a0e034c..3cb17cf08b 100644
--- a/extra/faq/faq.factor
+++ b/extra/faq/faq.factor
@@ -85,7 +85,7 @@ C: <faq> faq
 : toc, ( faq -- )
     "div" { { "style" "background-color: #eee; margin-left: 30%; margin-right: 30%; width: auto; padding: 5px; margin-top: 1em; margin-bottom: 1em" } } [
         "strong" [ "The big questions" , ] tag, br,
-        faq-lists 1 tail dup length [ toc-link, ] 2each
+        faq-lists rest dup length [ toc-link, ] 2each
     ] tag*, ;
 
 : faq-sections, ( question-lists -- )
diff --git a/extra/help/crossref/crossref.factor b/extra/help/crossref/crossref.factor
index 0b17461a99..54ede93aa1 100644
--- a/extra/help/crossref/crossref.factor
+++ b/extra/help/crossref/crossref.factor
@@ -14,7 +14,7 @@ M: link uses
     collect-elements [ \ f or ] map ;
 
 : help-path ( topic -- seq )
-    [ article-parent ] follow 1 tail ;
+    [ article-parent ] follow rest ;
 
 : set-article-parents ( parent article -- )
     article-children [ set-article-parent ] with each ;
diff --git a/extra/help/lint/lint.factor b/extra/help/lint/lint.factor
index 99c1798314..fc4b7f6f25 100755
--- a/extra/help/lint/lint.factor
+++ b/extra/help/lint/lint.factor
@@ -9,7 +9,7 @@ macros combinators.lib sequences.lib math sets ;
 IN: help.lint
 
 : check-example ( element -- )
-    1 tail [
+    rest [
         1 head* "\n" join 1vector
         [
             use [ clone ] change
@@ -23,7 +23,7 @@ IN: help.lint
 
 : extract-values ( element -- seq )
     \ $values swap elements dup empty? [
-        first 1 tail [ first ] map prune natural-sort
+        first rest [ first ] map prune natural-sort
     ] unless ;
 
 : effect-values ( word -- seq )
@@ -59,7 +59,7 @@ IN: help.lint
 
 : check-see-also ( word element -- )
     nip \ $see-also swap elements [
-        1 tail dup prune [ length ] bi@ assert=
+        rest dup prune [ length ] bi@ assert=
     ] each ;
 
 : vocab-exists? ( name -- ? )
diff --git a/extra/help/markup/markup.factor b/extra/help/markup/markup.factor
index 2e2b34ebfd..378dd1e2fe 100755
--- a/extra/help/markup/markup.factor
+++ b/extra/help/markup/markup.factor
@@ -311,7 +311,7 @@ M: array elements*
     [
         swap [
             elements [
-                1 tail [ dup set ] each
+                rest [ dup set ] each
             ] each
         ] curry each
     ] H{ } make-assoc keys ;
diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor
index afe83d180a..160b95ab1d 100755
--- a/extra/html/parser/analyzer/analyzer.factor
+++ b/extra/html/parser/analyzer/analyzer.factor
@@ -99,7 +99,7 @@ IN: html.parser.analyzer
     
 : find-between ( i/f tag/f vector -- vector )
     find-between* dup length 3 >= [
-        [ 1 tail-slice 1 head-slice* ] keep like
+        [ rest-slice 1 head-slice* ] keep like
     ] when ;
 
 : find-between-first ( string vector -- vector' )
diff --git a/extra/html/parser/utils/utils.factor b/extra/html/parser/utils/utils.factor
index b574799b38..0ae75e41fd 100644
--- a/extra/html/parser/utils/utils.factor
+++ b/extra/html/parser/utils/utils.factor
@@ -36,7 +36,7 @@ IN: html.parser.utils
     dup quoted? [ quote ] unless ;
 
 : unquote ( str -- newstr )
-    dup quoted? [ 1 head-slice* 1 tail-slice >string ] when ;
+    dup quoted? [ 1 head-slice* rest-slice >string ] when ;
 
 : quote? ( ch -- ? ) "'\"" member? ;
 
diff --git a/extra/http/client/client.factor b/extra/http/client/client.factor
index cc356ca8e3..7762b01843 100755
--- a/extra/http/client/client.factor
+++ b/extra/http/client/client.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs http kernel math math.parser namespaces sequences
 io io.sockets io.streams.string io.files io.timeouts strings
-splitting calendar continuations accessors vectors
+splitting calendar continuations accessors vectors math.order
 io.encodings.8-bit io.encodings.binary fry debugger inspector ;
 IN: http.client
 
diff --git a/extra/http/server/server.factor b/extra/http/server/server.factor
index 848d878c5b..7c88a608e5 100755
--- a/extra/http/server/server.factor
+++ b/extra/http/server/server.factor
@@ -149,7 +149,7 @@ TUPLE: dispatcher default responders ;
         [ nip ] [ drop default>> ] if
     ] [
         over first over responders>> at*
-        [ >r drop 1 tail-slice r> ] [ drop default>> ] if
+        [ >r drop rest-slice r> ] [ drop default>> ] if
     ] if ;
 
 M: dispatcher call-responder ( path dispatcher -- response )
diff --git a/extra/inverse/inverse.factor b/extra/inverse/inverse.factor
index 7a2856e311..265675f8df 100755
--- a/extra/inverse/inverse.factor
+++ b/extra/inverse/inverse.factor
@@ -204,7 +204,7 @@ DEFER: _
     "predicate" word-prop [ dupd call assure ] curry ;
 
 : slot-readers ( class -- quot )
-    all-slots 1 tail ! tail gets rid of delegate
+    all-slots rest ! tail gets rid of delegate
     [ slot-spec-reader 1quotation [ keep ] curry ] map concat
     [ ] like [ drop ] compose ;
 
@@ -218,7 +218,7 @@ DEFER: _
 
 : empty-inverse ( class -- quot )
     deconstruct-pred
-    [ tuple>array 1 tail [ ] contains? [ fail ] when ]
+    [ tuple>array rest [ ] contains? [ fail ] when ]
     compose ;
 
 \ new 1 [ ?wrapped empty-inverse ] define-pop-inverse
diff --git a/extra/irc/irc.factor b/extra/irc/irc.factor
index 4dda206c7b..1db17278ad 100755
--- a/extra/irc/irc.factor
+++ b/extra/irc/irc.factor
@@ -9,7 +9,7 @@ IN: irc
 ! utils
 : split-at-first ( seq separators -- before after )
     dupd '[ , member? ] find
-        [ cut 1 tail ]
+        [ cut rest ]
         [ swap ]
     if ;
 
@@ -101,7 +101,7 @@ SYMBOL: irc-client
 : irc-client> ( -- irc-client ) irc-client get ;
 : irc-stream> ( -- stream ) irc-client> stream>> ;
 
-: remove-heading-: ( seq -- seq ) dup ":" head? [ 1 tail ] when ;
+: remove-heading-: ( seq -- seq ) dup ":" head? [ rest ] when ;
 
 : parse-name ( string -- string )
     remove-heading-: "!" split-at-first drop ;
diff --git a/extra/jamshred/tunnel/tunnel.factor b/extra/jamshred/tunnel/tunnel.factor
index d5ee7f3ebc..c3f6b37fb8 100755
--- a/extra/jamshred/tunnel/tunnel.factor
+++ b/extra/jamshred/tunnel/tunnel.factor
@@ -84,7 +84,7 @@ TUPLE: segment number color radius ;
     pick >r nearer-segment dup r> = ;
 
 : find-nearest-segment ( oint segments -- segment )
-    dup first swap 1 tail-slice rot [ (find-nearest-segment) ] curry
+    dup first swap rest-slice rot [ (find-nearest-segment) ] curry
     find 2drop ;
     
 : nearest-segment-forward ( segments oint start -- segment )
diff --git a/extra/koszul/koszul.factor b/extra/koszul/koszul.factor
index 7e24d873a2..b4a0934e41 100755
--- a/extra/koszul/koszul.factor
+++ b/extra/koszul/koszul.factor
@@ -203,7 +203,7 @@ DEFER: (d)
     [ basis graded ] bi@ tensor bigraded-ker/im-d
     [ [ [ first ] map ] map ] keep
     [ [ second ] map 2 head* { 0 0 } prepend ] map
-    1 tail dup first length 0 <array> suffix
+    rest dup first length 0 <array> suffix
     [ v- ] 2map ;
 
 ! Laplacian
diff --git a/extra/locals/locals-docs.factor b/extra/locals/locals-docs.factor
index 372a567550..cac27d5296 100644
--- a/extra/locals/locals-docs.factor
+++ b/extra/locals/locals-docs.factor
@@ -16,6 +16,7 @@ HELP: [|
 { $examples
     { $example
         "USING: kernel locals math prettyprint ;"
+        "IN: scratchpad"
         ":: adder ( n -- quot ) [| m | m n + ] ;"
         "3 5 adder call ."
         "8"
@@ -29,6 +30,7 @@ HELP: [let
 { $examples
     { $example
         "USING: kernel locals math math.functions prettyprint sequences ;"
+        "IN: scratchpad"
         ":: frobnicate ( n seq -- newseq )"
         "    [let | n' [ n 6 * ] |"
         "        seq [ n' gcd nip ] map ] ;"
@@ -44,6 +46,7 @@ HELP: [let*
 { $examples
     { $example
         "USING: kernel locals math math.functions prettyprint sequences ;"
+        "IN: scratchpad"
         ":: frobnicate ( n seq -- newseq )"
         "    [let* | a [ n 3 + ]"
         "            b [ a 4 * ] |"
@@ -62,6 +65,7 @@ HELP: [wlet
 { $examples
     { $example
         "USING: locals math prettyprint sequences ;"
+        "IN: scratchpad"
         ":: quuxify ( n seq -- newseq )"
         "    [wlet | add-n [| m | m n + ] |"
         "        seq [ add-n ] map ] ;"
diff --git a/extra/locals/locals.factor b/extra/locals/locals.factor
index be73f1db88..9b5640f3d8 100755
--- a/extra/locals/locals.factor
+++ b/extra/locals/locals.factor
@@ -130,7 +130,7 @@ M: object free-vars* drop ;
 M: quotation free-vars* [ add-if-free ] each ;
 
 M: lambda free-vars*
-    [ vars>> ] [ body>> ] bi free-vars diff % ;
+    [ vars>> ] [ body>> ] bi free-vars swap diff % ;
 
 GENERIC: lambda-rewrite* ( obj -- )
 
diff --git a/extra/logging/analysis/analysis.factor b/extra/logging/analysis/analysis.factor
index e2c77377ac..cd1429ac53 100755
--- a/extra/logging/analysis/analysis.factor
+++ b/extra/logging/analysis/analysis.factor
@@ -14,7 +14,7 @@ SYMBOL: message-histogram
     dup second CRITICAL eq? [ dup errors get push ] when
     1 over third word-histogram get at+
     dup third word-names get member? [
-        1 over 1 tail message-histogram get at+
+        1 over rest message-histogram get at+
     ] when
     drop ;
 
diff --git a/extra/logging/server/server.factor b/extra/logging/server/server.factor
index 9da2bec927..7601d1cc2e 100755
--- a/extra/logging/server/server.factor
+++ b/extra/logging/server/server.factor
@@ -42,7 +42,7 @@ SYMBOL: log-files
         { [ dup length 1 = ] [ first -rot f (write-message) ] }
         [
             [ first -rot f (write-message) ] 3keep
-            1 tail -rot [ t (write-message) ] 2curry each
+            rest -rot [ t (write-message) ] 2curry each
         ]
     } cond ;
 
diff --git a/extra/match/match-docs.factor b/extra/match/match-docs.factor
index 4ac59bb0cc..2e23721e93 100644
--- a/extra/match/match-docs.factor
+++ b/extra/match/match-docs.factor
@@ -42,6 +42,7 @@ HELP: match-replace
 { $examples
   { $example
       "USING: match prettyprint ;"
+      "IN: scratchpad"
       "MATCH-VARS: ?a ?b ;"
       "{ 1 2 } { ?a ?b } { ?b ?a } match-replace ." 
       "{ 2 1 }"
diff --git a/extra/match/match.factor b/extra/match/match.factor
index e559ebc60d..c5a063ab98 100755
--- a/extra/match/match.factor
+++ b/extra/match/match.factor
@@ -67,13 +67,13 @@ MACRO: match-cond ( assoc -- )
     [ replace-patterns ] bind ;
 
 : ?1-tail ( seq -- tail/f )
-    dup length zero? not [ 1 tail ] [ drop f ] if ;
+    dup length zero? not [ rest ] [ drop f ] if ;
 
 : (match-first) ( seq pattern-seq -- bindings leftover/f )
     2dup [ length ] bi@ < [ 2drop f f ]
     [
         2dup length head over match
-        [ nip swap ?1-tail ] [ >r 1 tail r> (match-first) ] if*
+        [ nip swap ?1-tail ] [ >r rest r> (match-first) ] if*
     ] if ;
     
 : match-first ( seq pattern-seq -- bindings )
diff --git a/extra/math/matrices/matrices.factor b/extra/math/matrices/matrices.factor
index 327bf76552..294cd6278a 100755
--- a/extra/math/matrices/matrices.factor
+++ b/extra/math/matrices/matrices.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel sequences math math.functions
-math.vectors ;
+math.vectors math.order ;
 IN: math.matrices
 
 ! Matrices
diff --git a/extra/math/polynomials/polynomials.factor b/extra/math/polynomials/polynomials.factor
index 0b0d3520ef..c66f0c3fe3 100644
--- a/extra/math/polynomials/polynomials.factor
+++ b/extra/math/polynomials/polynomials.factor
@@ -58,7 +58,7 @@ PRIVATE>
     2dup /-last
     2dup , n*p swapd
     p- >vector
-    dup pop* swap 1 tail-slice ;
+    dup pop* swap rest-slice ;
 
 PRIVATE>
 
diff --git a/extra/memoize/memoize-tests.factor b/extra/memoize/memoize-tests.factor
index 3ce0abd7d9..43428efbe0 100644
--- a/extra/memoize/memoize-tests.factor
+++ b/extra/memoize/memoize-tests.factor
@@ -8,4 +8,4 @@ MEMO: fib ( m -- n )
 
 [ 89 ] [ 10 fib ] unit-test
 
-[ "USING: kernel math memoize ; MEMO: x ( a b c d e -- f g h i j ) >r >r >r >r 1+ r> r> r> r> ;" eval ] must-fail
+[ "USING: kernel math memoize ; IN: memoize.tests MEMO: x ( a b c d e -- f g h i j ) >r >r >r >r 1+ r> r> r> r> ;" eval ] must-fail
diff --git a/extra/multiline/multiline.factor b/extra/multiline/multiline.factor
index 079f484274..e140c5227c 100755
--- a/extra/multiline/multiline.factor
+++ b/extra/multiline/multiline.factor
@@ -34,7 +34,7 @@ IN: multiline
     [
         lexer get lexer-column swap (parse-multiline-string)
         lexer get set-lexer-column
-    ] "" make 1 tail 1 head* ;
+    ] "" make rest 1 head* ;
 
 : <"
     "\">" parse-multiline-string parsed ; parsing
diff --git a/extra/opengl/capabilities/capabilities.factor b/extra/opengl/capabilities/capabilities.factor
index 6802d15378..d658235cf6 100755
--- a/extra/opengl/capabilities/capabilities.factor
+++ b/extra/opengl/capabilities/capabilities.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel namespaces sequences splitting opengl.gl
-continuations math.parser math arrays sets ;
+continuations math.parser math arrays sets math.order ;
 IN: opengl.capabilities
 
 : (require-gl) ( thing require-quot make-error-quot -- )
@@ -15,7 +15,7 @@ IN: opengl.capabilities
 : has-gl-extensions? ( extensions -- ? )
     gl-extensions swap [ over member? ] all? nip ;
 : (make-gl-extensions-error) ( required-extensions -- )
-    gl-extensions swap diff
+    gl-extensions diff
     "Required OpenGL extensions not supported:\n" %
     [ "    " % % "\n" % ] each ;
 : require-gl-extensions ( extensions -- )
diff --git a/extra/opengl/demo-support/demo-support.factor b/extra/opengl/demo-support/demo-support.factor
index 84515305c8..460558db8b 100755
--- a/extra/opengl/demo-support/demo-support.factor
+++ b/extra/opengl/demo-support/demo-support.factor
@@ -1,5 +1,6 @@
-USING: arrays combinators.lib kernel math math.functions math.vectors namespaces
-       opengl opengl.gl sequences ui ui.gadgets ui.gestures ui.render ;
+USING: arrays combinators.lib kernel math math.functions
+math.order math.vectors namespaces opengl opengl.gl sequences ui
+ui.gadgets ui.gestures ui.render ;
 IN: opengl.demo-support
 
 : NEAR-PLANE 1.0 64.0 / ; inline
diff --git a/extra/optimizer/debugger/debugger.factor b/extra/optimizer/debugger/debugger.factor
index 3ae0c94b12..fa35534439 100755
--- a/extra/optimizer/debugger/debugger.factor
+++ b/extra/optimizer/debugger/debugger.factor
@@ -38,7 +38,7 @@ M: comment pprint*
         " --" %
         " " over node-out-d values%
         " r: " swap node-out-r values%
-    ] "" make 1 tail ;
+    ] "" make rest ;
 
 MACRO: match-choose ( alist -- )
     [ [ ] curry ] assoc-map [ match-cond ] curry ;
diff --git a/extra/parser-combinators/parser-combinators.factor b/extra/parser-combinators/parser-combinators.factor
index b710d9d481..9537a0c88c 100755
--- a/extra/parser-combinators/parser-combinators.factor
+++ b/extra/parser-combinators/parser-combinators.factor
@@ -177,7 +177,7 @@ M: or-parser parse ( input parser1 -- list )
     #! Return a new string without any leading whitespace
     #! from the original string.
     dup empty? [
-        dup first blank? [ 1 tail-slice left-trim-slice ] when
+        dup first blank? [ rest-slice left-trim-slice ] when
     ] unless ;
 
 TUPLE: sp-parser p1 ;
diff --git a/extra/peg/parsers/parsers.factor b/extra/peg/parsers/parsers.factor
index da7f678f2d..784e6c064c 100755
--- a/extra/peg/parsers/parsers.factor
+++ b/extra/peg/parsers/parsers.factor
@@ -107,7 +107,7 @@ MEMO: pack ( begin body end -- parser )
   #! range of characters from the first to the second,
   #! inclusive.
   dup first CHAR: ^ = [
-    1 tail (range-pattern) [ member? not ] curry satisfy 
+    rest (range-pattern) [ member? not ] curry satisfy 
   ] [
     (range-pattern) [ member? ] curry satisfy
   ] if ;
diff --git a/extra/peg/peg.factor b/extra/peg/peg.factor
index 3922fc9f86..b420574a3b 100755
--- a/extra/peg/peg.factor
+++ b/extra/peg/peg.factor
@@ -448,7 +448,7 @@ M: action-parser (compile) ( parser -- quot )
   #! Return a new string without any leading whitespace
   #! from the original string.
   dup empty? [
-    dup first blank? [ 1 tail-slice left-trim-slice ] when
+    dup first blank? [ rest-slice left-trim-slice ] when
   ] unless ;
 
 TUPLE: sp-parser p1 ;
diff --git a/extra/project-euler/023/023.factor b/extra/project-euler/023/023.factor
index 5d468a71c8..6b38a2b6ac 100644
--- a/extra/project-euler/023/023.factor
+++ b/extra/project-euler/023/023.factor
@@ -45,13 +45,14 @@ IN: project-euler.023
 : possible-sums ( seq -- seq )
     dup { } -rot [
         dupd [ + ] curry map
-        rot append prune swap 1 tail
+        rot append prune swap rest
     ] each drop natural-sort ;
 
 PRIVATE>
 
 : euler023 ( -- answer )
-    20161 abundants-upto possible-sums source-023 diff sum ;
+    source-023
+    20161 abundants-upto possible-sums diff sum ;
 
 ! TODO: solution is still too slow, although it takes under 1 minute
 
diff --git a/extra/project-euler/035/035.factor b/extra/project-euler/035/035.factor
index 53cee7c0ff..cec9bc6957 100755
--- a/extra/project-euler/035/035.factor
+++ b/extra/project-euler/035/035.factor
@@ -28,7 +28,7 @@ IN: project-euler.035
 
 : possible? ( seq -- ? )
     dup length 1 > [
-        dup { 0 2 4 5 6 8 } swap diff =
+        dup { 0 2 4 5 6 8 } diff =
     ] [
         drop t
     ] if ;
diff --git a/extra/project-euler/043/043.factor b/extra/project-euler/043/043.factor
index a607931083..41e378e531 100644
--- a/extra/project-euler/043/043.factor
+++ b/extra/project-euler/043/043.factor
@@ -79,7 +79,7 @@ PRIVATE>
     [ unclip 1 head prefix concat ] map [ all-unique? ] filter ;
 
 : add-missing-digit ( seq -- seq )
-    dup natural-sort 10 diff first prefix ;
+    dup natural-sort 10 swap diff first prefix ;
 
 : interesting-pandigitals ( -- seq )
     17 candidates { 13 11 7 5 3 2 } [
diff --git a/extra/project-euler/079/079.factor b/extra/project-euler/079/079.factor
index 65162cc519..3674804b0c 100644
--- a/extra/project-euler/079/079.factor
+++ b/extra/project-euler/079/079.factor
@@ -35,7 +35,7 @@ IN: project-euler.079
     ] { } make ;
 
 : find-source ( seq -- elt )
-    dup values swap keys [ prune ] bi@ diff
+    [ keys ] [ values ] bi diff prune
     dup empty? [ "Topological sort failed" throw ] [ first ] if ;
 
 : remove-source ( seq elt -- seq )
@@ -52,7 +52,7 @@ PRIVATE>
 
 : topological-sort ( seq -- seq )
     [ [ (topological-sort) ] { } make ] keep
-    concat prune dupd diff append ;
+    concat prune over diff append ;
 
 : euler079 ( -- answer )
     source-079 >edges topological-sort 10 digits>integer ;
diff --git a/extra/project-euler/common/common.factor b/extra/project-euler/common/common.factor
index 5829f66c01..19cf4010c3 100644
--- a/extra/project-euler/common/common.factor
+++ b/extra/project-euler/common/common.factor
@@ -40,10 +40,10 @@ IN: project-euler.common
 
 ! Propagate one row into the upper one
 : propagate ( bottom top -- newtop )
-    [ over 1 tail rot first2 max rot + ] map nip ;
+    [ over rest rot first2 max rot + ] map nip ;
 
 : shift-3rd ( seq obj obj -- seq obj obj )
-    rot 1 tail -rot ;
+    rot rest -rot ;
 
 : (sum-divisors) ( n -- sum )
     dup sqrt >fixnum [1,b] [
@@ -95,7 +95,7 @@ PRIVATE>
 ! Not strictly needed, but it is nice to be able to dump the triangle after the
 ! propagation
 : propagate-all ( triangle -- newtriangle )
-    reverse [ first dup ] keep 1 tail [ propagate dup ] map nip reverse swap suffix ;
+    reverse [ first dup ] keep rest [ propagate dup ] map nip reverse swap suffix ;
 
 : sum-divisors ( n -- sum )
     dup 4 < [ { 0 1 3 4 } nth ] [ (sum-divisors) ] if ;
diff --git a/extra/qualified/qualified.factor b/extra/qualified/qualified.factor
index 730388ade0..e48714bc44 100644
--- a/extra/qualified/qualified.factor
+++ b/extra/qualified/qualified.factor
@@ -23,7 +23,7 @@ IN: qualified
     ] curry map zip ;
 
 : partial-vocab-ignoring ( words name -- assoc )
-    [ vocab-words keys diff ] keep partial-vocab ;
+    [ vocab-words keys swap diff ] keep partial-vocab ;
 
 : EXCLUDE:
     #! Syntax: EXCLUDE: vocab => words ... ;
diff --git a/extra/random-weighted/random-weighted.factor b/extra/random-weighted/random-weighted.factor
index 476fc083a7..59cc15cba6 100644
--- a/extra/random-weighted/random-weighted.factor
+++ b/extra/random-weighted/random-weighted.factor
@@ -7,7 +7,7 @@ IN: random-weighted
 : probabilities ( weights -- probabilities ) dup sum v/n ;
 
 : layers ( probabilities -- layers )
-dup length 1+ [ head ] with map 1 tail [ sum ] map ;
+dup length 1+ [ head ] with map rest [ sum ] map ;
 
 : random-weighted ( weights -- elt )
 probabilities layers [ 1000 * ] map 1000 random [ > ] curry find drop ;
diff --git a/extra/random/mersenne-twister/mersenne-twister-tests.factor b/extra/random/mersenne-twister/mersenne-twister-tests.factor
index 703a0c16e4..d25ceacdb1 100755
--- a/extra/random/mersenne-twister/mersenne-twister-tests.factor
+++ b/extra/random/mersenne-twister/mersenne-twister-tests.factor
@@ -1,5 +1,5 @@
 USING: kernel math random namespaces random.mersenne-twister
-sequences tools.test ;
+sequences tools.test math.order ;
 IN: random.mersenne-twister.tests
 
 : check-random ( max -- ? )
diff --git a/extra/sequences/lib/lib.factor b/extra/sequences/lib/lib.factor
index b8e2717a71..ad5a40ed6d 100755
--- a/extra/sequences/lib/lib.factor
+++ b/extra/sequences/lib/lib.factor
@@ -117,7 +117,7 @@ MACRO: firstn ( n -- )
 
 : split-around ( seq quot -- before elem after )
     dupd find over [ "Element not found" throw ] unless
-    >r cut 1 tail r> swap ; inline
+    >r cut rest r> swap ; inline
 
 : (map-until) ( quot pred -- quot )
     [ dup ] swap 3compose
@@ -239,7 +239,7 @@ PRIVATE>
     zip >hashtable substitute ;
 
 : remove-nth ( seq n -- seq' )
-    cut-slice 1 tail-slice append ;
+    cut-slice rest-slice append ;
 
 : short ( seq n -- seq n' )
     over length min ; inline
diff --git a/extra/serialize/serialize.factor b/extra/serialize/serialize.factor
index bb69a8a41c..3bfd4c349b 100755
--- a/extra/serialize/serialize.factor
+++ b/extra/serialize/serialize.factor
@@ -111,7 +111,7 @@ M: tuple (serialize) ( obj -- )
         CHAR: T write1
         [ class (serialize) ]
         [ add-object ]
-        [ tuple>array 1 tail (serialize) ]
+        [ tuple>array rest (serialize) ]
         tri
     ] serialize-shared ;
 
diff --git a/extra/shufflers/authors.txt b/extra/shufflers/authors.txt
deleted file mode 100644
index f990dd0ed2..0000000000
--- a/extra/shufflers/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Daniel Ehrenberg
diff --git a/extra/shufflers/shufflers-docs.factor b/extra/shufflers/shufflers-docs.factor
deleted file mode 100644
index ac372534ae..0000000000
--- a/extra/shufflers/shufflers-docs.factor
+++ /dev/null
@@ -1,13 +0,0 @@
-USING: help.syntax help.markup ;
-IN: shufflers
-
-HELP: SHUFFLE:
-{ $syntax "SHUFFLE: alphabet #" }
-{ $values { "alphabet" "an alphabet of unique letters" } { "#" "the maximum length" } }
-{ $description "Defines stack shufflers of the form abc-bcba where 'abc' describes the inputs and 'bcba' describes the outputs. Given a stack of 1 2 3, this returns 2 3 2 1. The stack shufflers defined are put in the current vocab with the suffix '.shuffle' appended." }
-{ $examples
-"SHUFFLE: abcd 6\n"
-": 4drop abcd- ;\n"
-": 2over abcd-abcdab ;\n"
-": 2swap abcd-cdab ;\n"
-": 3dup abc-abcabc ;\n" } ;
diff --git a/extra/shufflers/shufflers-tests.factor b/extra/shufflers/shufflers-tests.factor
deleted file mode 100644
index 753f35b2e6..0000000000
--- a/extra/shufflers/shufflers-tests.factor
+++ /dev/null
@@ -1,8 +0,0 @@
-USING: shufflers tools.test ;
-IN: shufflers.tests
-
-SHUFFLE: abcd 4
-[ ] [ 1 2 3 4 abcd- ] unit-test
-[ 1 2 1 2 ] [ 1 2 3 abc-abab ] unit-test
-[ 4 3 2 1 ] [ 1 2 3 4 abcd-dcba ] unit-test
-[ 1 1 1 1 ] [ 1 a-aaaa ] unit-test
diff --git a/extra/shufflers/shufflers.factor b/extra/shufflers/shufflers.factor
deleted file mode 100644
index b11668a53e..0000000000
--- a/extra/shufflers/shufflers.factor
+++ /dev/null
@@ -1,36 +0,0 @@
-USING: kernel sequences words math math.functions arrays 
-shuffle quotations parser math.parser strings namespaces 
-splitting effects sequences.lib ;
-IN: shufflers
-
-: shuffle>string ( names shuffle -- string )
-    swap [ [ nth ] curry map ] curry map
-    first2 "-" swap 3append >string ;
-
-: make-shuffles ( max-out max-in -- shuffles )
-    [ 1+ dup rot strings [ 2array ] with map ]
-    with map concat ;
-
-: shuffle>quot ( shuffle -- quot )
-    [
-        first2 2dup [ - ] with map
-        reverse [ , \ npick , \ >r , ] each
-        swap , \ ndrop , length [ \ r> , ] times
-    ] [ ] make ;
-
-: put-effect ( word -- )
-    dup word-name "-" split1
-    [ >array [ 1string ] map ] bi@
-    <effect> "declared-effect" set-word-prop ;
-
-: in-shuffle ( -- ) in get ".shuffle" append set-in ;
-: out-shuffle ( -- ) in get ".shuffle" ?tail drop set-in ;
-
-: define-shuffles ( names max-out -- )
-    in-shuffle over length make-shuffles [
-        [ shuffle>string create-in ] keep
-        shuffle>quot dupd define put-effect
-    ] with each out-shuffle ;
-
-: SHUFFLE:
-    scan scan string>number define-shuffles ; parsing
diff --git a/extra/shufflers/summary.txt b/extra/shufflers/summary.txt
deleted file mode 100644
index 37b87be410..0000000000
--- a/extra/shufflers/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Arbitrary stack shuffling operators of the form abc-cbab
diff --git a/extra/shufflers/tags.txt b/extra/shufflers/tags.txt
deleted file mode 100644
index f4274299b1..0000000000
--- a/extra/shufflers/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-extensions
diff --git a/extra/symbols/symbols-docs.factor b/extra/symbols/symbols-docs.factor
index f542948970..9f79b71365 100644
--- a/extra/symbols/symbols-docs.factor
+++ b/extra/symbols/symbols-docs.factor
@@ -5,5 +5,5 @@ HELP: SYMBOLS:
 { $syntax "SYMBOLS: words... ;" }
 { $values { "words" "a sequence of new words to define" } }
 { $description "Creates a new word for every token until the ';'." }
-{ $examples { $example "USING: prettyprint symbols ;" "SYMBOLS: foo bar baz ;\nfoo . bar . baz ." "foo\nbar\nbaz" } }
+{ $examples { $example "USING: prettyprint symbols ;" "IN: scratchpad" "SYMBOLS: foo bar baz ;\nfoo . bar . baz ." "foo\nbar\nbaz" } }
 { $see-also POSTPONE: SYMBOL: } ;
diff --git a/extra/tools/deploy/shaker/shaker.factor b/extra/tools/deploy/shaker/shaker.factor
index b8ecf87989..f95b83467a 100755
--- a/extra/tools/deploy/shaker/shaker.factor
+++ b/extra/tools/deploy/shaker/shaker.factor
@@ -104,7 +104,7 @@ IN: tools.deploy.shaker
     set-global ;
 
 : strip-vocab-globals ( except names -- words )
-    [ child-vocabs [ words ] map concat ] map concat diff ;
+    [ child-vocabs [ words ] map concat ] map concat swap diff ;
 
 : stripped-globals ( -- seq )
     [
diff --git a/extra/tools/vocabs/vocabs.factor b/extra/tools/vocabs/vocabs.factor
index 2a5213c70d..e265f233e3 100755
--- a/extra/tools/vocabs/vocabs.factor
+++ b/extra/tools/vocabs/vocabs.factor
@@ -127,7 +127,7 @@ SYMBOL: modified-docs
             modified-sources get
             modified-docs get
         ]
-        [ modified-sources get modified-docs get append swap diff ] bi
+        [ modified-docs get modified-sources get append diff ] bi
     ] with-scope ;
 
 : do-refresh ( modified-sources modified-docs unchanged -- )
diff --git a/extra/ui/commands/commands-docs.factor b/extra/ui/commands/commands-docs.factor
index ed524148e3..5ff0752c19 100644
--- a/extra/ui/commands/commands-docs.factor
+++ b/extra/ui/commands/commands-docs.factor
@@ -47,6 +47,7 @@ HELP: command-name
 { $examples
     { $example
         "USING: io ui.commands ;"
+        "IN: scratchpad"
         ": com-my-command ;"
         "\\ com-my-command command-name write"
         "My Command"
@@ -105,6 +106,7 @@ HELP: command-string
 { $examples
     { $example
         "USING: io ui.commands ui.gestures ;"
+        "IN: scratchpad"
         ": com-my-command ;"
         "T{ key-down f { C+ } \"s\" } \\ com-my-command command-string write"
         "My Command (C+s)"
diff --git a/extra/ui/commands/commands.factor b/extra/ui/commands/commands.factor
index 9d6775159a..f341595969 100755
--- a/extra/ui/commands/commands.factor
+++ b/extra/ui/commands/commands.factor
@@ -56,7 +56,7 @@ GENERIC: command-word ( command -- word )
 M: word command-name ( word -- str )
     word-name
     "com-" ?head drop
-    dup first Letter? [ 1 tail ] unless
+    dup first Letter? [ rest ] unless
     (command-name) ;
 
 M: word command-description ( word -- str )
diff --git a/extra/ui/traverse/traverse.factor b/extra/ui/traverse/traverse.factor
index e3aff92109..85b2266159 100644
--- a/extra/ui/traverse/traverse.factor
+++ b/extra/ui/traverse/traverse.factor
@@ -60,7 +60,7 @@ DEFER: (gadget-subtree)
 
 : traverse-child ( frompath topath gadget -- )
     dup -roll [
-        >r >r 1 tail-slice r> r> traverse-step (gadget-subtree)
+        >r >r rest-slice r> r> traverse-step (gadget-subtree)
     ] make-node ;
 
 : (gadget-subtree) ( frompath topath gadget -- )
diff --git a/extra/unicode/data/data.factor b/extra/unicode/data/data.factor
index 0c7100d35c..5e1d30d529 100755
--- a/extra/unicode/data/data.factor
+++ b/extra/unicode/data/data.factor
@@ -59,7 +59,7 @@ IN: unicode.data
 
 : process-compat ( data -- hash )
     (process-decomposed)
-    [ dup first* [ first2 1 tail 2array ] unless ] map
+    [ dup first* [ first2 rest 2array ] unless ] map
     >hashtable chain-decomposed ;
 
 : process-combining ( data -- hash )
diff --git a/extra/xml/tokenize/tokenize.factor b/extra/xml/tokenize/tokenize.factor
index 5ba151c213..b4ff3a4ce9 100644
--- a/extra/xml/tokenize/tokenize.factor
+++ b/extra/xml/tokenize/tokenize.factor
@@ -162,7 +162,7 @@ SYMBOL: ns-stack
         T{ name f "" "version" f }
         T{ name f "" "encoding" f }
         T{ name f "" "standalone" f }
-    } swap diff
+    } diff
     dup empty? [ drop ] [ <extra-attrs> throw ] if ; 
 
 : good-version ( version -- version )
diff --git a/extra/xml/xml.factor b/extra/xml/xml.factor
index a75c5396f0..2d7c8c8ff8 100644
--- a/extra/xml/xml.factor
+++ b/extra/xml/xml.factor
@@ -12,7 +12,7 @@ IN: xml
 SYMBOL: xml-stack
 
 : <unclosed> ( -- unclosed )
-    xml-stack get 1 tail-slice [ first opener-name ] map
+    xml-stack get rest-slice [ first opener-name ] map
     { set-unclosed-tags } unclosed construct ;
 
 : add-child ( object -- )
@@ -93,7 +93,7 @@ M: closer process
 
 : make-xml-doc ( prolog seq -- xml-doc )
     dup [ tag? ] find
-    >r assure-tags cut 1 tail
+    >r assure-tags cut rest
     no-pre/post no-post-tags
     r> swap <xml> ;