diff --git a/extra/html/parser/parser.factor b/extra/html/parser/parser.factor
index 9209e2dbc8..61088d1b5e 100644
--- a/extra/html/parser/parser.factor
+++ b/extra/html/parser/parser.factor
@@ -42,10 +42,10 @@ SYMBOL: tagstack
 : make-dtd-tag ( string -- tag ) dtd new-tag ; inline
 
 : read-single-quote ( state-parser -- string )
-    [ [ CHAR: ' = ] take-until ] [ next drop ] bi ;
+    [ [ current CHAR: ' = ] take-until ] [ next drop ] bi ;
 
 : read-double-quote ( state-parser -- string )
-    [ [ CHAR: " = ] take-until ] [ next drop ] bi ;
+    [ [ current CHAR: " = ] take-until ] [ next drop ] bi ;
 
 : read-quote ( state-parser -- string )
     dup get+increment CHAR: ' =
@@ -53,14 +53,14 @@ SYMBOL: tagstack
 
 : read-key ( state-parser -- string )
     skip-whitespace
-    [ { [ CHAR: = = ] [ blank? ] } 1|| ] take-until ;
+    [ current { [ CHAR: = = ] [ blank? ] } 1|| ] take-until ;
 
 : read-= ( state-parser -- )
     skip-whitespace
-    [ [ CHAR: = = ] take-until drop ] [ next drop ] bi ;
+    [ [ current CHAR: = = ] take-until drop ] [ next drop ] bi ;
 
 : read-token ( state-parser -- string )
-    [ blank? ] take-until ;
+    [ current blank? ] take-until ;
 
 : read-value ( state-parser -- string )
     skip-whitespace
@@ -82,11 +82,11 @@ SYMBOL: tagstack
     ] if ;
 
 : read-tag ( state-parser -- string )
-    [ [ "><" member? ] take-until ]
+    [ [ current "><" member? ] take-until ]
     [ dup current CHAR: < = [ next ] unless drop ] bi ;
 
 : read-until-< ( state-parser -- string )
-    [ CHAR: < = ] take-until ;
+    [ current CHAR: < = ] take-until ;
 
 : parse-text ( state-parser -- )
     read-until-< [ make-text-tag push-tag ] unless-empty ;
diff --git a/extra/html/parser/state/state-tests.factor b/extra/html/parser/state/state-tests.factor
index f9862e1e69..835b54d0d3 100644
--- a/extra/html/parser/state/state-tests.factor
+++ b/extra/html/parser/state/state-tests.factor
@@ -7,7 +7,7 @@ IN: html.parser.state.tests
 [ "hi" " how are you?" ]
 [
     "hi how are you?"
-    [ [ [ blank? ] take-until ] [ take-rest ] bi ] state-parse
+    [ [ [ current blank? ] take-until ] [ take-rest ] bi ] state-parse
 ] unit-test
 
 [ "foo" ";bar" ]
@@ -30,7 +30,7 @@ IN: html.parser.state.tests
 ] unit-test
 
 [ { 1 2 } ]
-[ { 1 2 3 } <state-parser> [ 3 = ] take-until ] unit-test
+[ { 1 2 3 } <state-parser> [ current 3 = ] take-until ] unit-test
 
 [ { 1 2 } ]
 [ { 1 2 3 4 } <state-parser> { 3 4 } take-until-sequence ] unit-test
diff --git a/extra/html/parser/state/state.factor b/extra/html/parser/state/state.factor
index e1951fbd7c..3f899446c0 100644
--- a/extra/html/parser/state/state.factor
+++ b/extra/html/parser/state/state.factor
@@ -32,8 +32,8 @@ TUPLE: state-parser sequence n ;
 
 :: skip-until ( state quot: ( obj -- ? ) -- )
     state current [
-        quot call [ state next quot skip-until ] unless
-    ] when* ; inline recursive
+        state quot call [ state next quot skip-until ] unless
+    ] when ; inline recursive
 
 : state-parse-end? ( state -- ? ) peek-next not ;
 
@@ -53,7 +53,7 @@ TUPLE: state-parser sequence n ;
     sequence length <growing-circular> :> growing
     state-parser
     [
-        growing push-growing-circular
+        current growing push-growing-circular
         sequence growing sequence=
     ] take-until :> found
     found dup length
@@ -61,13 +61,13 @@ TUPLE: state-parser sequence n ;
     state-parser next drop ;
     
 : skip-whitespace ( state -- state )
-    [ [ blank? not ] take-until drop ] keep ;
+    [ [ current blank? not ] take-until drop ] keep ;
 
 : take-rest ( state -- sequence )
     [ drop f ] take-until ; inline
 
 : take-until-object ( state obj -- sequence )
-    '[ _ = ] take-until ;
+    '[ current _ = ] take-until ;
 
 : state-parse ( sequence quot -- )
     [ <state-parser> ] dip call ; inline