Clean up some use of callbacks.