Reintroduce CheckedAddressDiff now that multidispatch works