Redo grammar changes.
Fix (SELECT * not legal with GROUP BY) problem.
Aggregate visitor update.