Made DQL and EBNF in sync.