Remove redundancy (from Pete)
ABNF fixes from Bill Mills