Clean up callback calls.

If we only call the callback with the result of the function, don't
worry about adding a nested function and just call the callback. It'll
know what to do.