Use renamed AnnotationReader.