refactoring of term type assignment for annotations, cleaner now.