Fix missing explicit returns in our callback handling.