Amendments from pull request review. Empty tuple for grouping sets.