Small cleanup to annotation templates and i18n (fixes #230).