This implements what has been specified but it's still not done: we have to handle editing a comment or an annotation containing one.