Adds grouping support.
Fixes keyword rule.