more hardening of the parser against unexpected tokens