Cleaned up ebnf and converted to abnf (rfc5243).