Annotations – final testing?

I’ve made what I hope will be the final series of changes to the annotations work (at least, for its first release) – please see this posting on mb-users for details. Please test it, and let me know what you think. Thanks!