Updated token types in top-level parser.