Previous "repeat" fix required extra lookahead (leading to assert-fails).  Fixed, at the cost of an antlr warning that's safe to ignore for now.