diff --git a/core/alien/c-types/c-types.factor b/core/alien/c-types/c-types.factor
index 983fea0159..a67c7f4fb9 100755
--- a/core/alien/c-types/c-types.factor
+++ b/core/alien/c-types/c-types.factor
@@ -4,7 +4,7 @@ USING: bit-arrays byte-arrays float-arrays arrays
 generator.registers assocs kernel kernel.private libc math
 namespaces parser sequences strings words assocs splitting
 math.parser cpu.architecture alien alien.accessors quotations
-system compiler.units io.encodings.binary ;
+system compiler.units io.files io.encodings.binary ;
 IN: alien.c-types
 
 DEFER: <int>
diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor
index 5cb87da36f..28cf36060b 100755
--- a/core/io/encodings/encodings.factor
+++ b/core/io/encodings/encodings.factor
@@ -90,7 +90,7 @@ TUPLE: decoded code cr ;
 M: decoded stream-read
     tuck { delegate decoded-code } get-slots decode-read fix-read ;
 
-M: decoded stream-read-partial tuck stream-read fix-read ;
+M: decoded stream-read-partial stream-read ;
 
 : read-until-loop ( stream delim -- ch )
     ! Copied from { c-reader stream-read-until }!!!
@@ -113,7 +113,8 @@ M: decoded stream-read-until
         ] [ nip ] if
     ] [ nip ] if ;
 
-M: decoded stream-read1 1 swap stream-read ;
+M: decoded stream-read1
+    1 swap stream-read [ first ] [ f ] if* ;
 
 M: decoded stream-readln ( stream -- str )
     "\r\n" over stream-read-until handle-readln ;
diff --git a/core/io/streams/byte-array/byte-array.factor b/core/io/streams/byte-array/byte-array.factor
index eb224650f3..afbc94bf6a 100644
--- a/core/io/streams/byte-array/byte-array.factor
+++ b/core/io/streams/byte-array/byte-array.factor
@@ -3,14 +3,14 @@ sequences io namespaces ;
 IN: io.streams.byte-array
 
 : <byte-writer> ( encoding -- stream )
-    512 <byte-vector> swap <encoding> ;
+    512 <byte-vector> swap <encoded> ;
 
 : with-byte-writer ( encoding quot -- byte-array )
     >r <byte-writer> r> [ stdio get ] compose with-stream*
     >byte-array ; inline
 
 : <byte-reader> ( byte-array encoding -- stream )
-    >r >byte-vector dup reverse-here r> <decoding> ;
+    >r >byte-vector dup reverse-here r> <decoded> ;
 
 : with-byte-reader ( byte-array encoding quot -- )
     >r <byte-reader> r> with-stream ; inline
diff --git a/core/io/streams/c/c-docs.factor b/core/io/streams/c/c-docs.factor
index de8a756f92..d95e02321c 100644
--- a/core/io/streams/c/c-docs.factor
+++ b/core/io/streams/c/c-docs.factor
@@ -33,7 +33,7 @@ HELP: <c-writer> ( out -- stream )
 
 HELP: <duplex-c-stream>
 { $values { "in" "a C FILE* handle" } { "out" "a C FILE* handle" } { "stream" "a new stream" } }
-{ $description "Creates a stream which reads and writes data by calling C standard library functions, wrapping the input portion in a " { $link line-reader } " and the output portion in a " { $link plain-writer } "." } ;
+{ $description "Creates a duplex stream which reads and writes data by calling C standard library functions." } ;
 
 HELP: fopen ( path mode -- alien )
 { $values { "path" "a pathname string" } { "mode" "an access mode specifier" } { "alien" "a C FILE* handle" } }
diff --git a/core/io/streams/c/c.factor b/core/io/streams/c/c.factor
index 8a6430eb86..7481c79cb5 100755
--- a/core/io/streams/c/c.factor
+++ b/core/io/streams/c/c.factor
@@ -14,7 +14,7 @@ M: c-writer stream-write1
     >r 1string r> stream-write ;
 
 M: c-writer stream-write
-    c-writer-handle fwrite ;
+    >r >string r> c-writer-handle fwrite ;
 
 M: c-writer stream-flush
     c-writer-handle fflush ;
diff --git a/core/io/streams/plain/plain-docs.factor b/core/io/streams/plain/plain-docs.factor
index 4d7c5cc25e..a84e5be4f7 100644
--- a/core/io/streams/plain/plain-docs.factor
+++ b/core/io/streams/plain/plain-docs.factor
@@ -8,17 +8,10 @@ ARTICLE: "io.streams.plain" "Plain writer streams"
 { $link make-span-stream } ", "
 { $link make-block-stream } " and "
 { $link make-cell-stream } "."
-{ $subsection plain-writer }
-{ $subsection <plain-writer> } ;
+{ $subsection plain-writer } ;
 
 ABOUT: "io.streams.plain"
 
 HELP: plain-writer
-{ $class-description "An output stream which delegates to an underlying stream while providing an implementation of the extended stream output protocol in a trivial way. Plain writers are created by calling " { $link <plain-writer> } "." }
-{ $see-also "stream-protocol" } ;
-
-HELP: <plain-writer>
-{ $values { "stream" "an input stream" } { "new-stream" "an input stream" } }
-{ $description "Creates a new " { $link plain-writer } "." }
-{ $notes "Stream constructors should call this word to wrap streams that do not natively support the extended stream output protocol." }
+{ $class-description "An output stream mixin providing an implementation of the extended stream output protocol in a trivial way." }
 { $see-also "stream-protocol" } ;
diff --git a/core/listener/listener.factor b/core/listener/listener.factor
index 288cb53322..a29d7d5802 100755
--- a/core/listener/listener.factor
+++ b/core/listener/listener.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2003, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays hashtables io kernel math memory namespaces
-parser sequences strings io.styles io.streams.lines
+parser sequences strings io.styles
 io.streams.duplex vectors words generic system combinators
 tuples continuations debugger definitions compiler.units ;
 IN: listener
@@ -32,7 +32,7 @@ GENERIC: stream-read-quot ( stream -- quot/f )
         3drop f
     ] if ;
 
-M: line-reader stream-read-quot
+M: object stream-read-quot
     V{ } clone read-quot-loop ;
 
 M: duplex-stream stream-read-quot
diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index fe9d2769c9..be527f11c7 100755
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -4,7 +4,7 @@ USING: arrays definitions generic assocs kernel math
 namespaces prettyprint sequences strings vectors words
 quotations inspector io.styles io combinators sorting
 splitting math.parser effects continuations debugger 
-io.files io.streams.string io.streams.lines vocabs io.encodings.utf8
+io.files io.streams.string vocabs io.encodings.utf8
 source-files classes hashtables compiler.errors compiler.units ;
 IN: parser
 
diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor
index d2566982f8..185e9a1715 100755
--- a/core/source-files/source-files.factor
+++ b/core/source-files/source-files.factor
@@ -4,7 +4,7 @@ USING: arrays definitions generic assocs kernel math
 namespaces prettyprint sequences strings vectors words
 quotations inspector io.styles io combinators sorting
 splitting math.parser effects continuations debugger
-io.files io.crc32 io.streams.string io.streams.lines vocabs
+io.files io.crc32 io.streams.string vocabs
 hashtables graphs compiler.units io.encodings.utf8 ;
 IN: source-files
 
diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 2d53ed82e2..9ea38c9cff 100755
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces sequences io.files kernel assocs words vocabs
 definitions parser continuations inspector debugger io io.styles
-io.streams.lines hashtables sorting prettyprint source-files
+hashtables sorting prettyprint source-files
 arrays combinators strings system math.parser compiler.errors
 splitting ;
 IN: vocabs.loader
diff --git a/extra/crypto/sha1/sha1.factor b/extra/crypto/sha1/sha1.factor
index 8f8b3e0cdd..eaad6df622 100644
--- a/extra/crypto/sha1/sha1.factor
+++ b/extra/crypto/sha1/sha1.factor
@@ -1,6 +1,6 @@
 USING: arrays combinators crypto.common kernel io io.encodings.binary
 io.files io.streams.string math.vectors strings sequences
-namespaces math parser sequences vectors
+namespaces math parser sequences vectors io.binary
 hashtables ;
 IN: crypto.sha1
 
diff --git a/extra/db/sqlite/test.db b/extra/db/sqlite/test.db
new file mode 100644
index 0000000000..e483c47cea
Binary files /dev/null and b/extra/db/sqlite/test.db differ
diff --git a/extra/documents/documents.factor b/extra/documents/documents.factor
index 34ecce5f8e..993e69ec14 100755
--- a/extra/documents/documents.factor
+++ b/extra/documents/documents.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2007 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays io kernel math models namespaces sequences strings
-splitting io.streams.lines combinators unicode.categories ;
+splitting combinators unicode.categories ;
 IN: documents
 
 : +col ( loc n -- newloc ) >r first2 r> + 2array ;
diff --git a/extra/http/server/templating/templating.factor b/extra/http/server/templating/templating.factor
index d15bec4fb2..046541d94e 100755
--- a/extra/http/server/templating/templating.factor
+++ b/extra/http/server/templating/templating.factor
@@ -2,7 +2,7 @@
 ! Copyright (C) 2006, 2007 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations sequences kernel parser namespaces io
-io.files io.streams.lines io.streams.string html html.elements
+io.files io.streams.string html html.elements
 source-files debugger combinators math quotations generic
 strings splitting io.encodings.utf8 ;
 
diff --git a/extra/io/encodings/utf16/utf16.factor b/extra/io/encodings/utf16/utf16.factor
index a241913fb5..3e10dcba35 100755
--- a/extra/io/encodings/utf16/utf16.factor
+++ b/extra/io/encodings/utf16/utf16.factor
@@ -126,8 +126,6 @@ M: utf16be encode-string drop encode-utf16be ;
 M: utf16be decode-step drop decode-utf16be-step ;
 
 TUPLE: utf16 encoding ;
-M: utf16 underlying-stream delegate dup delegate [ ] [ ] ?if ; ! necessary? 
-M: utf16 set-underlying-stream delegate set-delegate ; ! necessary? 
 
 M: utf16 encode-string
     >r encode-utf16le r>
diff --git a/extra/io/launcher/launcher.factor b/extra/io/launcher/launcher.factor
index 13ae64f159..00cce32303 100755
--- a/extra/io/launcher/launcher.factor
+++ b/extra/io/launcher/launcher.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.backend io.timeouts system kernel namespaces
 strings hashtables sequences assocs combinators vocabs.loader
-init threads continuations math ;
+init threads continuations math io.encodings ;
 IN: io.launcher
 
 ! Non-blocking process exit notification facility
diff --git a/extra/io/nonblocking/nonblocking.factor b/extra/io/nonblocking/nonblocking.factor
index 0ae41f08fc..a8828afff6 100755
--- a/extra/io/nonblocking/nonblocking.factor
+++ b/extra/io/nonblocking/nonblocking.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 IN: io.nonblocking
 USING: math kernel io sequences io.buffers io.timeouts generic
-sbufs system io.streams.lines io.streams.plain io.streams.duplex
+sbufs system io.streams.plain io.streams.duplex io.encodings
 io.backend continuations debugger classes byte-arrays namespaces
 splitting dlists assocs ;
 
diff --git a/extra/io/unix/backend/backend.factor b/extra/io/unix/backend/backend.factor
index b1f4ee949d..d3873c60fe 100755
--- a/extra/io/unix/backend/backend.factor
+++ b/extra/io/unix/backend/backend.factor
@@ -2,9 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien generic assocs kernel kernel.private math
 io.nonblocking sequences strings structs sbufs
-threads unix vectors io.buffers io.backend
+threads unix vectors io.buffers io.backend io.encodings
 io.streams.duplex math.parser continuations system libc
-qualified namespaces io.timeouts ;
+qualified namespaces io.timeouts io.encodings.utf8 ;
 QUALIFIED: io
 IN: io.unix.backend
 
diff --git a/extra/tools/browser/browser.factor b/extra/tools/browser/browser.factor
index e56703a894..24836c1201 100755
--- a/extra/tools/browser/browser.factor
+++ b/extra/tools/browser/browser.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces splitting sequences io.files kernel assocs
 words vocabs vocabs.loader definitions parser continuations
-inspector debugger io io.styles io.streams.lines hashtables
+inspector debugger io io.styles hashtables
 sorting prettyprint source-files arrays combinators strings
 system math.parser help.markup help.topics help.syntax
 help.stylesheet memoize io.encodings.utf8 ;
diff --git a/extra/tools/deploy/macosx/macosx.factor b/extra/tools/deploy/macosx/macosx.factor
index e4a0d539d1..bdbb7f1aee 100755
--- a/extra/tools/deploy/macosx/macosx.factor
+++ b/extra/tools/deploy/macosx/macosx.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.files io.launcher kernel namespaces sequences
 system tools.deploy.backend tools.deploy.config assocs
-hashtables prettyprint io.unix.backend cocoa
+hashtables prettyprint io.unix.backend cocoa io.encodings.utf8
 cocoa.application cocoa.classes cocoa.plists qualified ;
 QUALIFIED: unix
 IN: tools.deploy.macosx
diff --git a/extra/ui/gadgets/labels/labels.factor b/extra/ui/gadgets/labels/labels.factor
index 5e5801dd02..167aa26084 100755
--- a/extra/ui/gadgets/labels/labels.factor
+++ b/extra/ui/gadgets/labels/labels.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays hashtables io kernel math namespaces
-opengl sequences io.streams.lines strings splitting
+opengl sequences strings splitting
 ui.gadgets ui.gadgets.tracks ui.gadgets.theme ui.render colors
 models ;
 IN: ui.gadgets.labels