diff --git a/basis/escape-strings/escape-strings.factor b/basis/escape-strings/escape-strings.factor
index 5f837c6d1e..1a14fad826 100644
--- a/basis/escape-strings/escape-strings.factor
+++ b/basis/escape-strings/escape-strings.factor
@@ -32,8 +32,8 @@ IN: escape-strings
     [ escape-string ] dip prepend ;
 
 : escape-simplest ( str -- str' )
-    dup { char: \' char: \" char: \r char: \n char: \s } counts {
-        { [ dup { char: \' char: \r char: \n char: \s } values-of sum 0 = ] [ drop "'" prepend ] }
+    dup { char: ' char: \" char: \r char: \n char: \s } counts {
+        { [ dup { char: ' char: \r char: \n char: \s } values-of sum 0 = ] [ drop "'" prepend ] }
         { [ dup char: \" of not ] [ drop "\"" "\"" surround ] }
         [ drop escape-string ]
     } cond ;
diff --git a/extra/combinators/extras/extras.factor b/extra/combinators/extras/extras.factor
index 3cd42feeb1..edf2904073 100644
--- a/extra/combinators/extras/extras.factor
+++ b/extra/combinators/extras/extras.factor
@@ -22,24 +22,6 @@ MACRO: cond-case ( assoc -- quot )
 MACRO: cleave-array ( quots -- quot )
     [ '[ _ cleave ] ] [ length '[ _ narray ] ] bi compose ;
 
-: 3bi* ( u v w x y z p q -- )
-    [ 3dip ] dip call ; inline
-
-: 3bi@ ( u v w x y z quot -- )
-    dup 3bi* ; inline
-
-: 4bi ( w x y z p q -- )
-    [ 4keep ] dip call ; inline
-
-: 4bi* ( s t u v w x y z p q -- )
-    [ 4dip ] dip call ; inline
-
-: 4bi@ ( s t u v w x y z quot -- )
-    dup 4bi* ; inline
-
-: 4tri ( w x y z p q r -- )
-    [ [ 4keep ] dip 4keep ] dip call ; inline
-
 : plox ( ... x/f quot: ( ... x -- ... ) -- ... )
     dupd when ; inline
 
diff --git a/extra/images/png/png.factor b/extra/images/png/png.factor
index 56fb3b5f83..ddf1ada422 100644
--- a/extra/images/png/png.factor
+++ b/extra/images/png/png.factor
@@ -183,7 +183,7 @@ ERROR: bad-filter n ;
     bit-depth :> depth!
     #components width * :> count!
 
-    #components bit-depth * width * 8 math::align 8 /i :> stride
+    #components bit-depth * width * 8 math:align 8 /i :> stride
 
     height [
         stride 1 + byte-reader stream-read
diff --git a/extra/irc/client/base/base.factor b/extra/irc/client/base/base.factor
index d9aba06148..0d87df309c 100644
--- a/extra/irc/client/base/base.factor
+++ b/extra/irc/client/base/base.factor
@@ -18,7 +18,7 @@ SYMBOL: current-irc-client
     \ current-irc-client swap with-variable ; inline
 
 UNION: to-target privmsg notice ;
-UNION: to-channel irc.messages::join part topic kick rpl-channel-modes
+UNION: to-channel irc.messages:join part topic kick rpl-channel-modes
                   topic rpl-names rpl-names-end ;
 UNION: to-one-chat to-target to-channel mode ;
 UNION: to-many-chats nick quit ;
diff --git a/extra/irc/client/internals/internals.factor b/extra/irc/client/internals/internals.factor
index 3aa566cc57..b039059ab5 100644
--- a/extra/irc/client/internals/internals.factor
+++ b/extra/irc/client/internals/internals.factor
@@ -76,7 +76,7 @@ GENERIC: process-message ( irc-message -- )
 M: object process-message drop ;
 M: ping   process-message trailing>> /PONG ;
 ! FIXME: it shouldn't be checking for the presence of chat here...
-M: irc.messages::join
+M: irc.messages:join
     process-message [ sender>> ] [ chat> ] bi
     [ join-participant ] [ drop ] if* ;
 M: part   process-message [ sender>> ] [ chat> ] bi [ part-participant ] [ drop ] if* ;
diff --git a/extra/irc/logbot/log-line/log-line.factor b/extra/irc/logbot/log-line/log-line.factor
index de7921db75..8d30867de5 100644
--- a/extra/irc/logbot/log-line/log-line.factor
+++ b/extra/irc/logbot/log-line/log-line.factor
@@ -23,7 +23,7 @@ M: privmsg >log-line
 : prefix% ( string -- )
     " [" % % "]" % ;
 
-M: irc.messages::join >log-line
+M: irc.messages:join >log-line
     [
         [ "* " % sender>> % ]
         [ prefix>> prefix% " has joined the channel." % ] bi
diff --git a/extra/multi-methods/multi-methods.factor b/extra/multi-methods/multi-methods.factor
index f611f4f7f0..a181b7fe3e 100644
--- a/extra/multi-methods/multi-methods.factor
+++ b/extra/multi-methods/multi-methods.factor
@@ -215,7 +215,7 @@ M: no-method error.
     [ "multi-method-specializer" word-prop ]
     [ "multi-method-generic" word-prop ] bi prefix ;
 
-: define-generic ( word effect -- )
+: define-multi-generic ( word effect -- )
     [ set-stack-effect ] keepd
     dup "multi-methods" word-prop [ drop ] [
         [ H{ } clone "multi-methods" set-word-prop ]
diff --git a/extra/nurbs/nurbs.factor b/extra/nurbs/nurbs.factor
index 7c63a0f1a5..cc938ff205 100644
--- a/extra/nurbs/nurbs.factor
+++ b/extra/nurbs/nurbs.factor
@@ -3,7 +3,7 @@
 USING: accessors alien.c-types grouping kernel locals math
 math.order math.ranges math.vectors math.vectors.homogeneous
 sequences specialized-arrays ;
-SPECIALIZED-ARRAY: alien.c-types::float
+SPECIALIZED-ARRAY: alien.c-types:float
 IN: nurbs
 
 TUPLE: nurbs-curve
diff --git a/extra/pdf/layout/layout.factor b/extra/pdf/layout/layout.factor
index 31343797b2..ae90d62d88 100644
--- a/extra/pdf/layout/layout.factor
+++ b/extra/pdf/layout/layout.factor
@@ -250,7 +250,7 @@ M: table-row pdf-render
     ] each widths >alist sort-keys values
 
     ! make last cell larger
-    dup sum 400 swap [-] [ + ] curry dupd sequences.extras::change-last
+    dup sum 400 swap [-] [ + ] curry dupd sequences.extras:change-last
 
     ! size down each column
     dup sum dup 400 > [ 400 swap / [ * ] curry map ] [ drop ] if ;