mild tweaks to structural_operations-grouping