diff --git a/basis/compiler/codegen/codegen.factor b/basis/compiler/codegen/codegen.factor
index d915b29ae5..486675ec26 100755
--- a/basis/compiler/codegen/codegen.factor
+++ b/basis/compiler/codegen/codegen.factor
@@ -3,7 +3,7 @@
 USING: namespaces make math math.order math.parser sequences accessors
 kernel kernel.private layouts assocs words summary arrays
 combinators classes.algebra alien alien.c-types alien.structs
-alien.strings alien.arrays alien.complex sets libc
+alien.strings alien.arrays alien.complex sets libc call
 continuations.private fry cpu.architecture
 compiler.errors
 compiler.alien
@@ -464,7 +464,7 @@ TUPLE: callback-context ;
     dup current-callback eq? [
         drop
     ] [
-        yield-hook get call wait-to-return
+        yield-hook get call( -- ) wait-to-return
     ] if ;
 
 : do-callback ( quot token -- )
diff --git a/basis/io/pipes/pipes.factor b/basis/io/pipes/pipes.factor
index 9cadb3f6cc..ad59cbc632 100644
--- a/basis/io/pipes/pipes.factor
+++ b/basis/io/pipes/pipes.factor
@@ -1,8 +1,8 @@
-! Copyright (C) 2008 Slava Pestov.
+! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.encodings io.backend io.ports io.streams.duplex
 io splitting grouping sequences namespaces kernel
-destructors math concurrency.combinators accessors
+destructors math concurrency.combinators accessors call fry
 arrays continuations quotations system vocabs.loader combinators ;
 IN: io.pipes
 
@@ -29,11 +29,12 @@ HOOK: (pipe) io-backend ( -- pipe )
 : ?writer ( handle/f -- stream )
     [ <output-port> &dispose ] [ output-stream get ] if* ;
 
-GENERIC: run-pipeline-element ( input-fd output-fd obj -- quot )
+GENERIC: run-pipeline-element ( input-fd output-fd obj -- result )
 
 M: callable run-pipeline-element
     [
-        [ [ ?reader ] [ ?writer ] bi* ] dip with-streams*
+        [ [ ?reader ] [ ?writer ] bi* ] dip
+        '[ _ call( -- result ) ] with-streams*
     ] with-destructors ;
 
 : <pipes> ( n -- pipes )
diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor
index 659195edbf..5e12322a48 100644
--- a/core/classes/tuple/parser/parser.factor
+++ b/core/classes/tuple/parser/parser.factor
@@ -30,7 +30,7 @@ ERROR: duplicate-slot-names names ;
 
 ERROR: invalid-slot-name name ;
 
-: parse-long-slot-name ( -- )
+: parse-long-slot-name ( -- spec )
     [ scan , \ } parse-until % ] { } make ;
 
 : parse-slot-name ( string/f -- ? )
@@ -64,7 +64,7 @@ ERROR: bad-literal-tuple ;
 
 : parse-slot-value ( -- )
     scan scan-object 2array , scan {
-        { f [ unexpected-eof ] }
+        { f [ \ } unexpected-eof ] }
         { "}" [ ] }
         [ bad-literal-tuple ]
     } case ;
@@ -72,13 +72,13 @@ ERROR: bad-literal-tuple ;
 : (parse-slot-values) ( -- )
     parse-slot-value
     scan {
-        { f [ unexpected-eof ] }
+        { f [ \ } unexpected-eof ] }
         { "{" [ (parse-slot-values) ] }
         { "}" [ ] }
         [ bad-literal-tuple ]
     } case ;
 
-: parse-slot-values ( -- )
+: parse-slot-values ( -- values )
     [ (parse-slot-values) ] { } make ;
 
 : boa>tuple ( class slots -- tuple )
diff --git a/core/generic/parser/parser.factor b/core/generic/parser/parser.factor
index 0852459c34..bf9cdb19f5 100644
--- a/core/generic/parser/parser.factor
+++ b/core/generic/parser/parser.factor
@@ -18,6 +18,6 @@ SYMBOL: current-method
 : with-method-definition ( method quot -- )
     over current-method set call current-method off ; inline
 
-: (M:) ( method def -- )
+: (M:) ( -- method def )
     CREATE-METHOD [ parse-definition ] with-method-definition ;
 
diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index c68d453b15..dddea09db9 100644
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -214,7 +214,7 @@ print-use-hook [ [ ] ] initialize
     [
         V{ } clone amended-use set
         parse-lines
-        amended-use get empty? [ print-use-hook get call ] unless
+        amended-use get empty? [ print-use-hook get assert-depth ] unless
     ] with-file-vocabs ;
 
 : parsing-file ( file -- )