Update to the new clone callback structure.