Ongoing cleanup of diving. moreCallback seems good, fix finalCallback and tests.