Simplification of AnnotationDefinitionSource