remove self type from Annotation, and make all Annotations be
ConstrainedAnnotations