Simplification of AnnotationExpressionValidator #133