Another tweak for bug #8318.  Annotations can now be edited.