Minor cleanup to rcc_socket_connect