Replace AnnotationsMap with simplified AnnotationList
72 files changed