drastic simplification of Annot
Merge branch 'master' of github.com:ermine-language/ermine