Split annotation case from transform code