Clear up explicit grouping.