Fix some parser glitches revealed by grako 3.0