 C: <ebnf-semantic> ebnf-semantic
 C: <ebnf> ebnf
 
-MIXIN: ebnf-ignored
-
-INSTANCE: ebnf-ignore ebnf-ignored
-INSTANCE: ebnf-ignore-repeat0 ebnf-ignored
-INSTANCE: ebnf-ignore-repeat1 ebnf-ignored
-
 : filter-hidden ( seq -- seq )
     ! Remove elements that produce no AST from sequence
     [ ebnf-ensure-not? ] reject [ ebnf-ensure? ] reject
-    [ ebnf-ignored? ] reject ;
+    [ ebnf-ignore? ] reject ;
 
 : syntax ( string -- parser )
     ! Parses the string, ignoring white space, and

    [ <ebnf-ignore> ] "~" syntax grouped ;

: ignore-repeat0-parser ( -- parser )
    [ <ebnf-ignore-repeat0> ] "*~" syntax grouped ;

: ignore-repeat1-parser ( -- parser )
    [ <ebnf-ignore-repeat1> ] "+~" syntax grouped ;

: optional-parser ( -- parser )
    [ <ebnf-optional> ] "?" syntax grouped ;

TUPLE: ebnf-repeat0 group ;
TUPLE: ebnf-repeat1 group ;
TUPLE: ebnf-ignore group ;
TUPLE: ebnf-optional group ;
TUPLE: ebnf-whitespace group ;
TUPLE: ebnf-tokenizer elements ;
