grouping: Remove <groups>, old <sliced-groups> is now <groups>. Fixes
grouping: Remove <clumps> and <circular-clumps> and rename <sliced-clumps>
and <sliced-circular-clumps> to those. Fixes #765.