editor: Cleaner _editAnnotation, at @aron's suggestion