diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 60a2b59e56..0a2b620ff2 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -1600,11 +1600,10 @@ static void cf_socket_active(struct Curl_cfilter *cf, struct Curl_easy *data)
   /* use this socket from now on */
   cf->conn->sock[cf->sockindex] = ctx->sock;
   set_local_ip(cf, data);
-  if(cf->sockindex == FIRSTSOCKET) {
-  #ifdef USE_IPV6
+#ifdef USE_IPV6
+  if(cf->sockindex == FIRSTSOCKET)
     cf->conn->bits.ipv6 = (ctx->addr.family == AF_INET6);
-  #endif
-  }
+#endif
   ctx->active = TRUE;
 }
 
diff --git a/lib/ftp.c b/lib/ftp.c
index 3dd6657407..a748f928da 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1927,11 +1927,9 @@ static CURLcode ftp_state_pasv_resp(struct Curl_easy *data,
 
 #ifndef CURL_DISABLE_PROXY
   if(conn->bits.proxy) {
-     /*
-     * This connection uses a proxy and we need to connect to the proxy again
+    /* This connection uses a proxy and we need to connect to the proxy again
      * here. We do not want to rely on a former host lookup that might've
-     * expired now, instead we remake the lookup here and now!
-     */
+     * expired now, instead we remake the lookup here and now! */
     struct ip_quadruple ipquad;
     int is_ipv6;
     const char * const host_name = conn->bits.socksproxy ?