Better callback handling.