Separate out "stateful" check_connectivity from raw check_connectivity