Fixed a weird find&replace error
Cleaned up the AnnotationService code somewhat.