InstructionGroupCreator: more code cleanup