aggregate: Remove some of the CFG workarounds