Replacing AndConstraint with AndWhichConstraint for NotBeNull() and related