Remove the use of DrainCallbacks() where we can.