Another tweak for bug #8313.  Now annotations can be edited and deleted.