Update to new callback signature.