This version of the patch set incorporates feedback from Brian, as well as a new patch at the end to check for IPv4 multicast addresses when doing the checkpoint.