diff --git a/extra/peg/peg.factor b/extra/peg/peg.factor
index 8b4991eef3..5ee497707d 100755
--- a/extra/peg/peg.factor
+++ b/extra/peg/peg.factor
@@ -3,7 +3,7 @@
 USING: kernel sequences strings fry namespaces math assocs shuffle 
        vectors arrays combinators.lib math.parser match
        unicode.categories sequences.lib compiler.units parser
-       words quotations effects memoize accessors locals effects ;
+       words quotations effects memoize accessors locals effects splitting ;
 IN: peg
 
 USE: prettyprint
@@ -269,19 +269,17 @@ MATCH-VARS: ?token ;
 
 : parse-token ( input string -- result )
   #! Parse the string, returning a parse result
-  2dup head? [
-    dup >r length tail-slice r> <parse-result>
+  dup >r ?head-slice [
+    r> <parse-result> 
   ] [
-    2drop f
+    r> 2drop f
   ] if ;
 
 M: token-parser (compile) ( parser -- quot )
-  [ \ input-slice , symbol>> , \ parse-token , ] [ ] make ;
+  symbol>> '[ input-slice , parse-token ] ;
    
 TUPLE: satisfy-parser quot ;
 
-MATCH-VARS: ?quot ;
-
 : parse-satisfy ( input quot -- result )
   swap dup empty? [
     2drop f 
@@ -320,6 +318,8 @@ M: range-parser (compile) ( parser -- quot )
 
 TUPLE: seq-parser parsers ;
 
+MATCH-VARS: ?quot ;
+
 : seq-pattern ( -- quot )
   [
     dup [