don't throw deadline exception when no cancel_points. minor cleanup