Fixed consistency errors with the AnnotT refactoring