Please merge #895: this `skipped_any` logic isn't right for checkpoints.