Rafoctored checkpoint instances to avoid an occasional timing issue on listen servers, and standardise the location event