diff --git a/lib/url.c b/lib/url.c
index 6c48dcb2e96c7dfcf45436e36928881157d9ccc5..3f55f7bda2111c298cc6d20ad5f5e698b2f68fa2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2463,7 +2463,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
     break;
 
   case CURLOPT_WILDCARDMATCH:
-    data->set.wildcardmatch = !! va_arg(param, long);
+    data->set.wildcardmatch = (bool)(0 != va_arg(param, long));
     break;
   case CURLOPT_CHUNK_BGN_FUNCTION:
     data->set.chunk_bgn = va_arg(param, curl_chunk_bgn_callback);
diff --git a/src/main.c b/src/main.c
index 4e0128cb724a49f706ad236ec187b00f709c250c..5827b5ed4abafeff8bac9d4d03eaa390367f71ce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2406,12 +2406,12 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
         config->ftp_pret = toggle;
         break;
       case 'D': /* --proto */
-        config->proto_present = 1;
+        config->proto_present = TRUE;
         if(proto2num(config, &config->proto, nextarg))
           return PARAM_BAD_USE;
         break;
       case 'E': /* --proto-redir */
-        config->proto_redir_present = 1;
+        config->proto_redir_present = TRUE;
         if(proto2num(config, &config->proto_redir, nextarg))
           return PARAM_BAD_USE;
         break;