parser: index_hint_list -> IndexHints
parser: drop obsolete tokens
parser VALUES -> Values
parser: group_by_opt -> GroupBy
parser: having_opt -> Where
parser: order_by_opt -> OrderBy
parser: limit_opt -> Limit
parser: bunch of misc non-terminals converted