Some refactoring of class handling in the annotator. Remove class specialisation and _settled_ flag.
_settled_