Improve delegate callback signature.