Cleanup of 'callback' testing code.