Fix AnnotationAnnotateCommand to catch all cases of pre-existing
annotations with the same key correctly