Annotation fixes for split.