Cleanup calls to do_connect(): don't set values to their defaults