get rid of explicit CoGrouped/UnsortedGrouped references, explain types in comments