diff --git a/base/drop_privileges.c b/base/drop_privileges.c
index f31c7706..8063f1c5 100644
--- a/base/drop_privileges.c
+++ b/base/drop_privileges.c
@@ -64,9 +64,10 @@ drop_privileges (gchar *username, GError **error)
 
   if (geteuid () == 0)
     {
-      struct passwd *user_pw = NULL;
+      struct passwd *user_pw;
 
-      if ((user_pw = getpwnam (username)))
+      user_pw = getpwnam (username);
+      if (user_pw)
         {
           if (initgroups (username, user_pw->pw_gid) != 0)
             return drop_privileges_error (
diff --git a/base/hosts.c b/base/hosts.c
index 7c1c4ca6..085c427c 100644
--- a/base/hosts.c
+++ b/base/hosts.c
@@ -1053,7 +1053,8 @@ gvm_hosts_deduplicate (gvm_hosts_t *hosts)
     {
       gchar *name;
 
-      if ((name = gvm_host_value_str (hosts->hosts[i])))
+      name = gvm_host_value_str (hosts->hosts[i]);
+      if (name)
         {
           gvm_host_t *host, *removed = hosts->hosts[i];
 
@@ -1589,7 +1590,8 @@ gvm_hosts_exclude_with_max (gvm_hosts_t *hosts, const char *excluded_str,
     {
       gchar *name;
 
-      if ((name = gvm_host_value_str (excluded_hosts->hosts[i])))
+      name = gvm_host_value_str (excluded_hosts->hosts[i]);
+      if (name)
         g_hash_table_insert (name_table, name, hosts);
     }
 
@@ -1598,7 +1600,8 @@ gvm_hosts_exclude_with_max (gvm_hosts_t *hosts, const char *excluded_str,
     {
       gchar *name;
 
-      if ((name = gvm_host_value_str (hosts->hosts[i])))
+      name = gvm_host_value_str (hosts->hosts[i]);
+      if (name)
         {
           if (g_hash_table_lookup (name_table, name))
             {
@@ -1667,7 +1670,8 @@ gvm_hosts_allowed_only (gvm_hosts_t *hosts, const char *deny_hosts_str,
         {
           gchar *name;
 
-          if ((name = gvm_host_value_str (denied_hosts->hosts[i])))
+          name = gvm_host_value_str (denied_hosts->hosts[i]);
+          if (name)
             g_hash_table_insert (name_deny_table, name, hosts);
         }
     }
@@ -1682,7 +1686,8 @@ gvm_hosts_allowed_only (gvm_hosts_t *hosts, const char *deny_hosts_str,
         {
           gchar *name;
 
-          if ((name = gvm_host_value_str (allowed_hosts->hosts[i])))
+          name = gvm_host_value_str (allowed_hosts->hosts[i]);
+          if (name)
             g_hash_table_insert (name_allow_table, name, hosts);
         }
     }
@@ -1693,7 +1698,8 @@ gvm_hosts_allowed_only (gvm_hosts_t *hosts, const char *deny_hosts_str,
     {
       gchar *name;
 
-      if ((name = gvm_host_value_str (hosts->hosts[i])))
+      name = gvm_host_value_str (hosts->hosts[i]);
+      if (name)
         {
           if (denied_hosts != NULL
               && g_hash_table_lookup (name_deny_table, name))
@@ -2022,7 +2028,8 @@ gvm_hosts_reverse_lookup_unify_excluded (gvm_hosts_t *hosts)
     {
       gchar *name;
 
-      if ((name = gvm_host_reverse_lookup (hosts->hosts[i])))
+      name = gvm_host_reverse_lookup (hosts->hosts[i]);
+      if (name)
         {
           if (g_hash_table_lookup (name_table, name))
             {
diff --git a/base/networking.c b/base/networking.c
index ce63af6f..a38ef291 100644
--- a/base/networking.c
+++ b/base/networking.c
@@ -949,7 +949,8 @@ get_routes (void)
 
       interface = g_strndup (items_in_line[0], 64);
       /* Cut interface str after ":" if IP aliasing is used. */
-      if ((char_p = strchr (interface, ':')))
+      char_p = strchr (interface, ':');
+      if (char_p)
         {
           *char_p = '\0';
         }
@@ -1292,7 +1293,8 @@ gvm_get_outgoing_iface (struct sockaddr_storage *target_addr)
     return NULL;
 
   // get a connected udp socket
-  if ((sockfd = get_connected_udp_sock (target_addr)) < 0)
+  sockfd = get_connected_udp_sock (target_addr);
+  if (sockfd < 0)
     return NULL;
   // get socked address which is the addr of the interface we want to get
   out_iface_addr.ss_family = family;
diff --git a/base/pwpolicy.c b/base/pwpolicy.c
index cc2bef96..0b8dc08c 100644
--- a/base/pwpolicy.c
+++ b/base/pwpolicy.c
@@ -241,7 +241,8 @@ parse_pattern_line (char *line, const char *fname, int lineno, char **descp,
   else if (*line == '#' && line[1] == '+') /* Processing instruction.  */
     {
       line += 2;
-      if ((p = is_keyword (line, "desc")))
+      p = is_keyword (line, "desc");
+      if (p)
         {
           g_free (*descp);
           if (*p)