diff --git a/extra/io/encodings/utf16/.utf16.factor.swo b/core/io/encodings/utf16/.utf16.factor.swo
similarity index 100%
rename from extra/io/encodings/utf16/.utf16.factor.swo
rename to core/io/encodings/utf16/.utf16.factor.swo
diff --git a/extra/io/encodings/utf16/authors.txt b/core/io/encodings/utf16/authors.txt
similarity index 100%
rename from extra/io/encodings/utf16/authors.txt
rename to core/io/encodings/utf16/authors.txt
diff --git a/extra/io/encodings/utf16/summary.txt b/core/io/encodings/utf16/summary.txt
similarity index 100%
rename from extra/io/encodings/utf16/summary.txt
rename to core/io/encodings/utf16/summary.txt
diff --git a/extra/io/encodings/utf16/tags.txt b/core/io/encodings/utf16/tags.txt
similarity index 100%
rename from extra/io/encodings/utf16/tags.txt
rename to core/io/encodings/utf16/tags.txt
diff --git a/extra/io/encodings/utf16/utf16-docs.factor b/core/io/encodings/utf16/utf16-docs.factor
similarity index 100%
rename from extra/io/encodings/utf16/utf16-docs.factor
rename to core/io/encodings/utf16/utf16-docs.factor
diff --git a/extra/io/encodings/utf16/utf16-tests.factor b/core/io/encodings/utf16/utf16-tests.factor
similarity index 100%
rename from extra/io/encodings/utf16/utf16-tests.factor
rename to core/io/encodings/utf16/utf16-tests.factor
diff --git a/extra/io/encodings/utf16/utf16.factor b/core/io/encodings/utf16/utf16.factor
similarity index 95%
rename from extra/io/encodings/utf16/utf16.factor
rename to core/io/encodings/utf16/utf16.factor
index fbc296e57c..953671d7f4 100755
--- a/extra/io/encodings/utf16/utf16.factor
+++ b/core/io/encodings/utf16/utf16.factor
@@ -126,11 +126,11 @@ M: utf16 <encoder> ( stream utf16 -- encoder )
 
 ! Native-order UTF-16
 
-: native-utf16 ( -- descriptor )
-    little-endian? utf16le utf16be ? ;
+: utf16n ( -- descriptor )
+    little-endian? utf16le utf16be ? ; foldable
 
-M: utf16n <decoder> drop native-utf16 <decoder> ;
+M: utf16n <decoder> drop utf16n <decoder> ;
 
-M: utf16n <encoder> drop native-utf16 <encoder> ;
+M: utf16n <encoder> drop utf16n <encoder> ;
 
 PRIVATE>
diff --git a/extra/benchmark/spectral-norm/spectral-norm.factor b/extra/benchmark/spectral-norm/spectral-norm.factor
index 2c7dc1e80d..7eddeefc1b 100644
--- a/extra/benchmark/spectral-norm/spectral-norm.factor
+++ b/extra/benchmark/spectral-norm/spectral-norm.factor
@@ -19,7 +19,7 @@ IN: benchmark.spectral-norm
         pick 0.0 [
             swap >r >r 2dup r> (eval-A-times-u) r> +
         ] reduce nip
-    ] F{ } map-as { float-array } declare 2nip ; inline
+    ] F{ } map-as 2nip ; inline
 
 : (eval-At-times-u) ( u i j -- x )
     tuck swap eval-A >r swap nth-unsafe r> * ; inline
@@ -29,7 +29,7 @@ IN: benchmark.spectral-norm
         pick 0.0 [
             swap >r >r 2dup r> (eval-At-times-u) r> +
         ] reduce nip
-    ] F{ } map-as { float-array } declare 2nip ; inline
+    ] F{ } map-as 2nip ; inline
 
 : eval-AtA-times-u ( n u -- seq )
     dupd eval-A-times-u eval-At-times-u ; inline
diff --git a/extra/bit-vectors/bit-vectors.factor b/extra/bit-vectors/bit-vectors.factor
index b011f146c5..c14b0a5476 100755
--- a/extra/bit-vectors/bit-vectors.factor
+++ b/extra/bit-vectors/bit-vectors.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel kernel.private math sequences
 sequences.private growable bit-arrays prettyprint.backend
-parser ;
+parser accessors ;
 IN: bit-vectors
 
 TUPLE: bit-vector underlying fill ;
@@ -44,7 +44,7 @@ M: bit-array new-resizable drop <bit-vector> ;
 
 INSTANCE: bit-vector growable
 
-: ?V \ } [ >bit-vector ] parse-literal ; parsing
+: ?V{ \ } [ >bit-vector ] parse-literal ; parsing
 
 M: bit-vector >pprint-sequence ;
 
diff --git a/extra/float-vectors/float-vectors.factor b/extra/float-vectors/float-vectors.factor
index f0db37610a..d51f0d4e44 100755
--- a/extra/float-vectors/float-vectors.factor
+++ b/extra/float-vectors/float-vectors.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays kernel kernel.private math sequences
 sequences.private growable float-arrays prettyprint.backend
-parser ;
+parser accessors ;
 IN: float-vectors
 
 TUPLE: float-vector underlying fill ;