Tidy up some messy admin bits and add update form for annotation.
Disambigate item- and description-level identifiers and their i18 names. Fixes #482