Updated custom BNF to ABNF as described in RFC 5234.