Add AnnotationArrayField for handling idiosyncrasies of annotations.
Merging in upstream changes.