[PATCH 02/12] Clean up callbacks in the user spoke.