diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index fbb5da356..4439bb945 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -2017,11 +2017,13 @@ TEH_KS_denomination_key_lookup_by_hash (
   struct GNUNET_TIME_Absolute now;
   const struct GNUNET_CONTAINER_MultiHashMap *map;
 
-  map = (TEH_KS_DKU_RECOUP == use) ? key_state->revoked_map :
-        key_state->denomkey_map;
+  map = (TEH_KS_DKU_RECOUP == use)
+        ? key_state->revoked_map
+        : key_state->denomkey_map;
   dki = GNUNET_CONTAINER_multihashmap_get (map,
                                            denom_pub_hash);
-  if ( (NULL == dki) && (TEH_KS_DKU_ZOMBIE == use))
+  if ( (NULL == dki) &&
+       (TEH_KS_DKU_ZOMBIE == use) )
     dki = GNUNET_CONTAINER_multihashmap_get (key_state->revoked_map,
                                              denom_pub_hash);
   if (NULL == dki)
diff --git a/src/exchange/taler-exchange-httpd_melt.c b/src/exchange/taler-exchange-httpd_melt.c
index 0af0da04a..35cd2359e 100644
--- a/src/exchange/taler-exchange-httpd_melt.c
+++ b/src/exchange/taler-exchange-httpd_melt.c
@@ -151,11 +151,11 @@ struct MeltContext
   struct TALER_Amount coin_refresh_fee;
 
   /**
-   * Set to #GNUNET_YES if this coin's denomination was revoked and the operation
+   * Set to true if this coin's denomination was revoked and the operation
    * is thus only allowed for zombie coins where the transaction
    * history includes a #TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP.
    */
-  int zombie_required;
+  bool zombie_required;
 
   /**
    * We already checked and noticed that the coin is known. Hence we
@@ -216,11 +216,11 @@ refresh_check_melt (struct MHD_Connection *connection,
     {
       if (TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP == tp->type)
       {
-        rmc->zombie_required = GNUNET_NO; /* clear flag: was satisfied! */
+        rmc->zombie_required = false; /* clear flag: was satisfied! */
         break;
       }
     }
-    if (GNUNET_YES == rmc->zombie_required)
+    if (rmc->zombie_required)
     {
       /* zombie status not satisfied */
       GNUNET_break_op (0);
@@ -541,7 +541,7 @@ check_for_denomination_key (struct MHD_Connection *connection,
                                                     &ec,
                                                     &hc);
       if (NULL != dki)
-        rmc->zombie_required = GNUNET_YES; /* check later that zombie is satisfied */
+        rmc->zombie_required = true; /* check later that zombie is satisfied */
     }
     if (NULL == dki)
     {