Improve expected token parser error messages