[OPT] (GroupingOper) Flattened grouping code already working again.