Fix inconsistent behaviour with respect to verify_callback handling.