small fixes in ABNF expansion