Add some necessary grouping to code transforms.