diff --git a/lib/imap.c b/lib/imap.c
index d219b7454..845d7dd4c 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1245,8 +1245,7 @@ static CURLcode imap_state_fetch_resp(struct connectdata *conn, int imapcode,
       Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
     else
       /* IMAP download */
-      Curl_setup_transfer(conn, FIRSTSOCKET, size, FALSE, NULL,
-                          -1, NULL); /* no upload here */
+      Curl_setup_transfer(conn, FIRSTSOCKET, size, FALSE, NULL, -1, NULL);
 
     data->req.maxdownload = size;
   }
diff --git a/lib/pop3.c b/lib/pop3.c
index 23d7e97b2..ffccfe0e0 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1093,7 +1093,6 @@ static CURLcode pop3_state_command_resp(struct connectdata *conn,
 {
   CURLcode result = CURLE_OK;
   struct SessionHandle *data = conn->data;
-  struct POP3 *pop3 = data->state.proto.pop3;
   struct pop3_conn *pop3c = &conn->proto.pop3c;
   struct pingpong *pp = &pop3c->pp;
 
@@ -1115,8 +1114,7 @@ static CURLcode pop3_state_command_resp(struct connectdata *conn,
   pop3c->strip = 2;
 
   /* POP3 download */
-  Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, NULL,
-                      -1, NULL); /* no upload here */
+  Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, NULL, -1, NULL);
 
   if(pp->cache) {
     /* The header "cache" contains a bunch of data that is actually body
diff --git a/lib/smtp.c b/lib/smtp.c
index b033edabf..376106923 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1100,8 +1100,7 @@ static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode,
   }
 
   /* SMTP upload */
-  Curl_setup_transfer(conn, -1, -1, FALSE, NULL, /* no download */
-                      FIRSTSOCKET, NULL);
+  Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);
 
   /* End of do phase */
   state(conn, SMTP_STOP);