Fix a problem with construction of AnnotatedXxx (last change for 2.5 databind)