Could we simplify by directly calling getAnnotationValidator, and returning null if there is none?