Tidy up callbacks some more.