diff --git a/basis/io/buffers/buffers-docs.factor b/basis/io/buffers/buffers-docs.factor
index 266c0d64f1..fbe352185c 100755
--- a/basis/io/buffers/buffers-docs.factor
+++ b/basis/io/buffers/buffers-docs.factor
@@ -35,8 +35,8 @@ HELP: buffer
 $nl
 "Buffers have two internal pointers:"
 { $list
-    { { $link buffer-fill } " - the fill pointer, a write index where new data is added" }
-    { { $link buffer-pos } " - the position, a read index where data is consumed" }
+    { { $snippet "fill" } " - the fill pointer, a write index where new data is added" }
+    { { $snippet "pos" } " - the position, a read index where data is consumed" }
 } } ;
 
 HELP: <buffer>
diff --git a/basis/io/launcher/launcher.factor b/basis/io/launcher/launcher.factor
index 09f240c53a..1b22ca8501 100755
--- a/basis/io/launcher/launcher.factor
+++ b/basis/io/launcher/launcher.factor
@@ -53,7 +53,7 @@ SYMBOL: +realtime-priority+
     dup handle>> swap status>> or ;
 
 : process-running? ( process -- ? )
-    process-handle >boolean ;
+    handle>> >boolean ;
 
 ! Non-blocking process exit notification facility
 SYMBOL: processes
@@ -80,7 +80,7 @@ SYMBOL: wait-flag
     V{ } clone swap processes get set-at
     wait-flag get-global raise-flag ;
 
-M: process hashcode* process-handle hashcode* ;
+M: process hashcode* handle>> hashcode* ;
 
 : pass-environment? ( process -- ? )
     dup environment>> assoc-empty? not
@@ -99,9 +99,14 @@ M: process hashcode* process-handle hashcode* ;
 
 GENERIC: >process ( obj -- process )
 
+ERROR: process-already-started ;
+
+M: process-already-started summary
+    drop "Process has already been started once" ;
+
 M: process >process
     dup process-started? [
-        "Process has already been started once" throw
+        process-already-started
     ] when
     clone ;
 
@@ -111,6 +116,8 @@ HOOK: current-process-handle io-backend ( -- handle )
 
 HOOK: run-process* io-backend ( process -- handle )
 
+ERROR: process-was-killed ;
+
 : wait-for-process ( process -- status )
     [
         dup handle>>
@@ -119,7 +126,7 @@ HOOK: run-process* io-backend ( process -- handle )
             "process" suspend drop
         ] when
         dup killed>>
-        [ "Process was killed" throw ] [ status>> ] if
+        [ process-was-killed ] [ status>> ] if
     ] with-timeout ;
 
 : run-detached ( desc -- process )
@@ -150,7 +157,7 @@ HOOK: kill-process* io-backend ( handle -- )
 
 M: process timeout timeout>> ;
 
-M: process set-timeout set-process-timeout ;
+M: process set-timeout swap >>timeout drop ;
 
 M: process cancel-operation kill-process ;
 
@@ -222,10 +229,12 @@ GENERIC: underlying-handle ( stream -- handle )
 
 M: port underlying-handle handle>> ;
 
+ERROR: invalid-duplex-stream ;
+
 M: duplex-stream underlying-handle
     [ in>> underlying-handle ]
     [ out>> underlying-handle ] bi
-    [ = [ "Invalid duplex stream" throw ] when ] keep ;
+    [ = [ invalid-duplex-stream ] when ] keep ;
 
 M: encoder underlying-handle
     stream>> underlying-handle ;
diff --git a/basis/macros/macros.factor b/basis/macros/macros.factor
index e8cd9d1d19..0a6621f044 100755
--- a/basis/macros/macros.factor
+++ b/basis/macros/macros.factor
@@ -2,14 +2,14 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: parser kernel sequences words effects
 stack-checker.transforms combinators assocs definitions
-quotations namespaces memoize ;
+quotations namespaces memoize accessors ;
 IN: macros
 
 : real-macro-effect ( word -- effect' )
-    "declared-effect" word-prop effect-in 1 <effect> ;
+    "declared-effect" word-prop in>> 1 <effect> ;
 
 : define-macro ( word definition -- )
-    over "declared-effect" word-prop effect-in length >r
+    over "declared-effect" word-prop in>> length >r
     2dup "macro" set-word-prop
     2dup over real-macro-effect memoize-quot [ call ] append define
     r> define-transform ;
diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor
index 534ab0fd09..6ad883cfcb 100755
--- a/basis/prettyprint/prettyprint-tests.factor
+++ b/basis/prettyprint/prettyprint-tests.factor
@@ -2,7 +2,8 @@ USING: arrays definitions io.streams.string io.streams.duplex
 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 ;
+continuations generic compiler.units tools.walker eval
+accessors ;
 IN: prettyprint.tests
 
 [ "4" ] [ 4 unparse ] unit-test
@@ -296,7 +297,7 @@ M: class-see-layout class-see-layout ;
     [ \ class-see-layout see-methods ] with-string-writer "\n" split
 ] unit-test
 
-[ ] [ \ effect-in synopsis drop ] unit-test
+[ ] [ \ in>> synopsis drop ] unit-test
 
 ! Regression
 [ t ] [