Fix #57.
Follow-up to #57: fix additional places where Hex4Digits was not recongized as a nonterminal; and recognize "[match only if ...]" as a grammar annotation.