Added override checking code back into AnnotationDriver.