Sorted code into ebnf comments.