[MOD] Simplified `group-by` logic regarding collations.