Simplify the logic in make_connection_snum(), and make it match Windows behavior.