diff --git a/extra/peg/ebnf/ebnf.factor b/extra/peg/ebnf/ebnf.factor
index 2a6b55ad9d..ff4bd2db61 100644
--- a/extra/peg/ebnf/ebnf.factor
+++ b/extra/peg/ebnf/ebnf.factor
@@ -518,11 +518,16 @@ M: ebnf-non-terminal (transform) ( ast -- parser )
     "Could not parse EBNF" throw
   ] if ;
 
+: parse-ebnf ( string -- hashtable )
+  'ebnf' parse check-parse-result ast>> transform ;
+
 : ebnf>quot ( string -- hashtable quot )
-  'ebnf' parse check-parse-result 
-  parse-result-ast transform dup dup parser [ main swap at compile ] with-variable
+  parse-ebnf dup dup parser [ main swap at compile ] with-variable
   [ compiled-parse ] curry [ with-scope ] curry ;
 
+: <EBNF "EBNF>" reset-tokenizer parse-multiline-string parse-ebnf main swap at  
+  parsed reset-tokenizer ; parsing
+
 : [EBNF "EBNF]" reset-tokenizer parse-multiline-string ebnf>quot nip 
   parsed \ call parsed reset-tokenizer ; parsing