Handle EINPROGRESS for connect.
Beef up canonicalize a little.