Standardize return - important for callbacks.

I think this is how you do a pull request?