Simplify returns in callbacks

Simplify returns in callbacks.