More work cleaning up JSB callbacks.