diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index f45834b57..dbc591a6f 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -961,10 +961,11 @@ struct TALER_EXCHANGE_WireAccount
  * @return #GNUNET_OK if parsing @a accounts succeeded
  */
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_parse_accounts (const struct TALER_MasterPublicKeyP *master_pub,
-                               const json_t *accounts,
-                               struct TALER_EXCHANGE_WireAccount was[],
-                               unsigned int was_length);
+TALER_EXCHANGE_parse_accounts (
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const json_t *accounts,
+  unsigned int was_length,
+  struct TALER_EXCHANGE_WireAccount was[static was_length]);
 
 
 /**
@@ -974,8 +975,9 @@ TALER_EXCHANGE_parse_accounts (const struct TALER_MasterPublicKeyP *master_pub,
  * @param was_len length of the @a was array
  */
 void
-TALER_EXCHANGE_free_accounts (struct TALER_EXCHANGE_WireAccount *was,
-                              unsigned int was_len);
+TALER_EXCHANGE_free_accounts (
+  unsigned int was_len,
+  struct TALER_EXCHANGE_WireAccount was[static was_len]);
 
 
 /**
@@ -1302,7 +1304,7 @@ TALER_EXCHANGE_batch_deposit (
   struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_EXCHANGE_DepositContractDetail *dcd,
   unsigned int num_cdds,
-  const struct TALER_EXCHANGE_CoinDepositDetail *cdds,
+  const struct TALER_EXCHANGE_CoinDepositDetail cdds[static num_cdds],
   TALER_EXCHANGE_BatchDepositResultCallback cb,
   void *cb_cls,
   enum TALER_ErrorCode *ec);
@@ -1312,7 +1314,7 @@ TALER_EXCHANGE_batch_deposit (
  * Change the chance that our deposit confirmation will be given to the
  * auditor to 100%.
  *
- * @param deposit the batch deposit permission request handle
+ * @param[in,out] deposit the batch deposit permission request handle
  */
 void
 TALER_EXCHANGE_batch_deposit_force_dc (
@@ -1323,7 +1325,7 @@ TALER_EXCHANGE_batch_deposit_force_dc (
  * Cancel a batch deposit permission request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
- * @param deposit the deposit permission request handle
+ * @param[in] deposit the deposit permission request handle
  */
 void
 TALER_EXCHANGE_batch_deposit_cancel (
@@ -1543,7 +1545,7 @@ TALER_EXCHANGE_csr_melt (
   const char *url,
   const struct TALER_RefreshMasterSecretP *rms,
   unsigned int nks_len,
-  struct TALER_EXCHANGE_NonceKey *nks,
+  struct TALER_EXCHANGE_NonceKey nks[static nks_len],
   TALER_EXCHANGE_CsRMeltCallback res_cb,
   void *res_cb_cls);
 
@@ -2590,8 +2592,8 @@ typedef void
  * @param exchange_url The base-URL of the exchange
  * @param keys The /keys material from the exchange
  * @param reserve_priv private key of the reserve to withdraw from
- * @param wcis inputs that determine the planchets
  * @param wci_length number of entries in @a wcis
+ * @param wcis inputs that determine the planchets
  * @param res_cb the callback to call when the final result for this request is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
@@ -2604,8 +2606,8 @@ TALER_EXCHANGE_batch_withdraw (
   const char *exchange_url,
   const struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_EXCHANGE_WithdrawCoinInput *wcis,
   unsigned int wci_length,
+  const struct TALER_EXCHANGE_WithdrawCoinInput wcis[static wci_length],
   TALER_EXCHANGE_BatchWithdrawCallback res_cb,
   void *res_cb_cls);
 
@@ -2802,8 +2804,8 @@ TALER_EXCHANGE_batch_withdraw2 (
   const char *exchange_url,
   const struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_PlanchetDetail *pds,
   unsigned int pds_length,
+  const struct TALER_PlanchetDetail pds[static pds_length],
   TALER_EXCHANGE_BatchWithdraw2Callback res_cb,
   void *res_cb_cls);
 
@@ -2901,8 +2903,8 @@ typedef void
  * @param exchange_url The base url of the exchange
  * @parm keys The denomination keys from the exchange
  * @param reserve_priv The pivate key to the reserve
- * @param coin_inputs The input for the coins to withdraw
  * @param num_coins The number of elements in @e coin_inputs
+ * @param coin_inputs The input for the coins to withdraw
  * @param max_age The maximum age we commit to.
  * @param res_cb A callback for the result, maybe NULL
  * @param res_cb_cls A closure for @e res_cb, maybe NULL
@@ -2915,8 +2917,9 @@ TALER_EXCHANGE_age_withdraw (
   const char *exchange_url,
   struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_EXCHANGE_AgeWithdrawCoinInput *coin_inputs,
   size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[
+    const static num_coins],
   uint8_t max_age,
   TALER_EXCHANGE_AgeWithdrawCallback res_cb,
   void *res_cb_cls);
@@ -3237,7 +3240,7 @@ TALER_EXCHANGE_refreshes_reveal (
   const struct TALER_RefreshMasterSecretP *rms,
   const struct TALER_EXCHANGE_RefreshData *rd,
   unsigned int num_coins,
-  const struct TALER_ExchangeWithdrawValues *alg_values,
+  const struct TALER_ExchangeWithdrawValues alg_values[static num_coins],
   uint32_t noreveal_index,
   TALER_EXCHANGE_RefreshesRevealCallback reveal_cb,
   void *reveal_cb_cls);
@@ -3708,19 +3711,19 @@ TALER_EXCHANGE_parse_reserve_history (
   struct TALER_Amount *total_in,
   struct TALER_Amount *total_out,
   unsigned int history_length,
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory);
+  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static history_length]);
 
 
 /**
  * Free memory (potentially) allocated by #TALER_EXCHANGE_parse_reserve_history().
  *
- * @param rhistory result to free
  * @param len number of entries in @a rhistory
+ * @param[in] rhistory result to free
  */
 void
 TALER_EXCHANGE_free_reserve_history (
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory,
-  unsigned int len);
+  unsigned int len,
+  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static len]);
 
 
 /* ********************* /recoup *********************** */
@@ -6138,7 +6141,7 @@ TALER_EXCHANGE_purse_create_with_deposit (
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   const json_t *contract_terms,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   bool upload_contract,
   TALER_EXCHANGE_PurseCreateDepositCallback cb,
   void *cb_cls);
@@ -6540,7 +6543,7 @@ TALER_EXCHANGE_purse_deposit (
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   uint8_t min_age,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   TALER_EXCHANGE_PurseDepositCallback cb,
   void *cb_cls);
 
@@ -6681,7 +6684,8 @@ TALER_EXCHANGE_reserves_open (
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_Amount *reserve_contribution,
   unsigned int coin_payments_length,
-  const struct TALER_EXCHANGE_PurseDeposit *coin_payments,
+  const struct TALER_EXCHANGE_PurseDeposit coin_payments[
+    static coin_payments_length],
   struct GNUNET_TIME_Timestamp expiration_time,
   uint32_t min_purses,
   TALER_EXCHANGE_ReservesOpenCallback cb,
@@ -6692,7 +6696,7 @@ TALER_EXCHANGE_reserves_open (
  * Cancel a reserve status request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
- * @param roh the reserve open request handle
+ * @param[in] roh the reserve open request handle
  */
 void
 TALER_EXCHANGE_reserves_open_cancel (
@@ -6886,7 +6890,7 @@ TALER_EXCHANGE_reserves_attest (
   const char *url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   unsigned int attributes_length,
-  const char *const*attributes,
+  const char *attributes[const static attributes_length],
   TALER_EXCHANGE_ReservesPostAttestCallback cb,
   void *cb_cls);
 
diff --git a/src/lib/exchange_api_age_withdraw.c b/src/lib/exchange_api_age_withdraw.c
index 4e146c15c..e862b1480 100644
--- a/src/lib/exchange_api_age_withdraw.c
+++ b/src/lib/exchange_api_age_withdraw.c
@@ -356,12 +356,12 @@ reserve_age_withdraw_payment_required (
           rhistory))
     {
       GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
+      TALER_EXCHANGE_free_reserve_history (len,
+                                           rhistory);
       return GNUNET_SYSERR;
     }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
+    TALER_EXCHANGE_free_reserve_history (len,
+                                         rhistory);
   }
 
   /* Check that funds were really insufficient */
@@ -769,17 +769,17 @@ csr_withdraw_done (
  * csr-parameter via /csr-withdraw.
  *
  * @param awh The handler to the age-withdraw
- * @param coin_inputs The input for the individial coin(-candidates)
  * @param num_coins The number of coins in @e coin_inputs
- *
+ * @param coin_inputs The input for the individial coin(-candidates)
  * @return GNUNET_OK on success, GNUNET_SYSERR on failure
  */
 static
 enum GNUNET_GenericReturnValue
 prepare_coins (
   struct TALER_EXCHANGE_AgeWithdrawHandle *awh,
-  const struct TALER_EXCHANGE_AgeWithdrawCoinInput *coin_inputs,
-  size_t num_coins)
+  size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[
+    static num_coins])
 {
 
   if (GNUNET_OK != TALER_amount_set_zero (
@@ -949,8 +949,9 @@ TALER_EXCHANGE_age_withdraw (
   const char *exchange_url,
   struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_EXCHANGE_AgeWithdrawCoinInput *coin_inputs,
   size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[
+    const static num_coins],
   uint8_t max_age,
   TALER_EXCHANGE_AgeWithdrawCallback res_cb,
   void *res_cb_cls)
@@ -976,8 +977,8 @@ TALER_EXCHANGE_age_withdraw (
     return NULL;
 
   if (GNUNET_OK != prepare_coins (awh,
-                                  coin_inputs,
-                                  num_coins))
+                                  num_coins,
+                                  coin_inputs))
     return NULL;
 
   /* If there were no CS denominations, we can now perform the actual
diff --git a/src/lib/exchange_api_batch_deposit.c b/src/lib/exchange_api_batch_deposit.c
index 22ae2d58d..1fc9c44d1 100644
--- a/src/lib/exchange_api_batch_deposit.c
+++ b/src/lib/exchange_api_batch_deposit.c
@@ -559,7 +559,7 @@ TALER_EXCHANGE_batch_deposit (
   struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_EXCHANGE_DepositContractDetail *dcd,
   unsigned int num_cdds,
-  const struct TALER_EXCHANGE_CoinDepositDetail *cdds,
+  const struct TALER_EXCHANGE_CoinDepositDetail cdds[static num_cdds],
   TALER_EXCHANGE_BatchDepositResultCallback cb,
   void *cb_cls,
   enum TALER_ErrorCode *ec)
diff --git a/src/lib/exchange_api_batch_withdraw.c b/src/lib/exchange_api_batch_withdraw.c
index 07ad37f63..a1fcccce4 100644
--- a/src/lib/exchange_api_batch_withdraw.c
+++ b/src/lib/exchange_api_batch_withdraw.c
@@ -270,8 +270,8 @@ phase_two (struct TALER_EXCHANGE_BatchWithdrawHandle *wh)
     wh->exchange_url,
     wh->keys,
     wh->reserve_priv,
-    pds,
     wh->num_coins,
+    pds,
     &handle_reserve_batch_withdraw_finished,
     wh);
 }
@@ -339,8 +339,8 @@ TALER_EXCHANGE_batch_withdraw (
   const char *exchange_url,
   const struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_EXCHANGE_WithdrawCoinInput *wcis,
   unsigned int wci_length,
+  const struct TALER_EXCHANGE_WithdrawCoinInput wcis[static wci_length],
   TALER_EXCHANGE_BatchWithdrawCallback res_cb,
   void *res_cb_cls)
 {
diff --git a/src/lib/exchange_api_batch_withdraw2.c b/src/lib/exchange_api_batch_withdraw2.c
index a855fc57e..1f59a6980 100644
--- a/src/lib/exchange_api_batch_withdraw2.c
+++ b/src/lib/exchange_api_batch_withdraw2.c
@@ -229,12 +229,12 @@ reserve_batch_withdraw_payment_required (
           rhistory))
     {
       GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
+      TALER_EXCHANGE_free_reserve_history (len,
+                                           rhistory);
       return GNUNET_SYSERR;
     }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
+    TALER_EXCHANGE_free_reserve_history (len,
+                                         rhistory);
   }
 
   /* Check that funds were really insufficient */
@@ -391,8 +391,8 @@ TALER_EXCHANGE_batch_withdraw2 (
   const char *exchange_url,
   const struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_PlanchetDetail *pds,
   unsigned int pds_length,
+  const struct TALER_PlanchetDetail pds[static pds_length],
   TALER_EXCHANGE_BatchWithdraw2Callback res_cb,
   void *res_cb_cls)
 {
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 77a5cf816..7c86ec597 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -654,7 +654,7 @@ TALER_EXCHANGE_parse_reserve_history (
   struct TALER_Amount *total_in,
   struct TALER_Amount *total_out,
   unsigned int history_length,
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory)
+  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static history_length])
 {
   const struct
   {
@@ -753,8 +753,8 @@ TALER_EXCHANGE_parse_reserve_history (
 
 void
 TALER_EXCHANGE_free_reserve_history (
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory,
-  unsigned int len)
+  unsigned int len,
+  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static len])
 {
   for (unsigned int i = 0; i<len; i++)
   {
@@ -2281,10 +2281,11 @@ fail:
 
 
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_parse_accounts (const struct TALER_MasterPublicKeyP *master_pub,
-                               const json_t *accounts,
-                               struct TALER_EXCHANGE_WireAccount was[],
-                               unsigned int was_length)
+TALER_EXCHANGE_parse_accounts (
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const json_t *accounts,
+  unsigned int was_length,
+  struct TALER_EXCHANGE_WireAccount was[static was_length])
 {
   memset (was,
           0,
@@ -2370,8 +2371,9 @@ TALER_EXCHANGE_parse_accounts (const struct TALER_MasterPublicKeyP *master_pub,
 
 
 void
-TALER_EXCHANGE_free_accounts (struct TALER_EXCHANGE_WireAccount *was,
-                              unsigned int was_len)
+TALER_EXCHANGE_free_accounts (
+  unsigned int was_len,
+  struct TALER_EXCHANGE_WireAccount was[static was_len])
 {
   for (unsigned int i = 0; i<was_len; i++)
   {
diff --git a/src/lib/exchange_api_csr_melt.c b/src/lib/exchange_api_csr_melt.c
index da6c392aa..f59995af3 100644
--- a/src/lib/exchange_api_csr_melt.c
+++ b/src/lib/exchange_api_csr_melt.c
@@ -221,7 +221,7 @@ TALER_EXCHANGE_csr_melt (
   const char *url,
   const struct TALER_RefreshMasterSecretP *rms,
   unsigned int nks_len,
-  struct TALER_EXCHANGE_NonceKey *nks,
+  struct TALER_EXCHANGE_NonceKey nks[static nks_len],
   TALER_EXCHANGE_CsRMeltCallback res_cb,
   void *res_cb_cls)
 {
diff --git a/src/lib/exchange_api_purse_create_with_deposit.c b/src/lib/exchange_api_purse_create_with_deposit.c
index af05bf923..13874678a 100644
--- a/src/lib/exchange_api_purse_create_with_deposit.c
+++ b/src/lib/exchange_api_purse_create_with_deposit.c
@@ -506,7 +506,7 @@ TALER_EXCHANGE_purse_create_with_deposit (
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   const json_t *contract_terms,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   bool upload_contract,
   TALER_EXCHANGE_PurseCreateDepositCallback cb,
   void *cb_cls)
diff --git a/src/lib/exchange_api_purse_deposit.c b/src/lib/exchange_api_purse_deposit.c
index e1d38d16e..7bb3b9517 100644
--- a/src/lib/exchange_api_purse_deposit.c
+++ b/src/lib/exchange_api_purse_deposit.c
@@ -453,7 +453,7 @@ TALER_EXCHANGE_purse_deposit (
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   uint8_t min_age,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   TALER_EXCHANGE_PurseDepositCallback cb,
   void *cb_cls)
 {
diff --git a/src/lib/exchange_api_refreshes_reveal.c b/src/lib/exchange_api_refreshes_reveal.c
index e698a2977..291c3be12 100644
--- a/src/lib/exchange_api_refreshes_reveal.c
+++ b/src/lib/exchange_api_refreshes_reveal.c
@@ -311,7 +311,7 @@ TALER_EXCHANGE_refreshes_reveal (
   const struct TALER_RefreshMasterSecretP *rms,
   const struct TALER_EXCHANGE_RefreshData *rd,
   unsigned int num_coins,
-  const struct TALER_ExchangeWithdrawValues *alg_values,
+  const struct TALER_ExchangeWithdrawValues alg_values[static num_coins],
   uint32_t noreveal_index,
   TALER_EXCHANGE_RefreshesRevealCallback reveal_cb,
   void *reveal_cb_cls)
diff --git a/src/lib/exchange_api_reserves_attest.c b/src/lib/exchange_api_reserves_attest.c
index ea9ec8426..2537dd16a 100644
--- a/src/lib/exchange_api_reserves_attest.c
+++ b/src/lib/exchange_api_reserves_attest.c
@@ -229,7 +229,7 @@ TALER_EXCHANGE_reserves_attest (
   const char *url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   unsigned int attributes_length,
-  const char *const*attributes,
+  const char *attributes[const static attributes_length],
   TALER_EXCHANGE_ReservesPostAttestCallback cb,
   void *cb_cls)
 {
diff --git a/src/lib/exchange_api_reserves_history.c b/src/lib/exchange_api_reserves_history.c
index a48e0c087..d4366eb37 100644
--- a/src/lib/exchange_api_reserves_history.c
+++ b/src/lib/exchange_api_reserves_history.c
@@ -141,8 +141,8 @@ handle_reserves_history_ok (struct TALER_EXCHANGE_ReservesHistoryHandle *rsh,
                                               rhistory))
     {
       GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
+      TALER_EXCHANGE_free_reserve_history (len,
+                                           rhistory);
       return GNUNET_SYSERR;
     }
     if (NULL != rsh->cb)
@@ -153,8 +153,8 @@ handle_reserves_history_ok (struct TALER_EXCHANGE_ReservesHistoryHandle *rsh,
                &rs);
       rsh->cb = NULL;
     }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
+    TALER_EXCHANGE_free_reserve_history (len,
+                                         rhistory);
   }
   return GNUNET_OK;
 }
diff --git a/src/lib/exchange_api_reserves_open.c b/src/lib/exchange_api_reserves_open.c
index b28333d51..536efdb10 100644
--- a/src/lib/exchange_api_reserves_open.c
+++ b/src/lib/exchange_api_reserves_open.c
@@ -430,7 +430,8 @@ TALER_EXCHANGE_reserves_open (
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_Amount *reserve_contribution,
   unsigned int coin_payments_length,
-  const struct TALER_EXCHANGE_PurseDeposit *coin_payments,
+  const struct TALER_EXCHANGE_PurseDeposit coin_payments[
+    static coin_payments_length],
   struct GNUNET_TIME_Timestamp expiration_time,
   uint32_t min_purses,
   TALER_EXCHANGE_ReservesOpenCallback cb,
diff --git a/src/lib/exchange_api_reserves_status.c b/src/lib/exchange_api_reserves_status.c
index 9f98b7f8c..2ea64e8aa 100644
--- a/src/lib/exchange_api_reserves_status.c
+++ b/src/lib/exchange_api_reserves_status.c
@@ -129,8 +129,8 @@ handle_reserves_status_ok (struct TALER_EXCHANGE_ReservesStatusHandle *rsh,
                                               rhistory))
     {
       GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
+      TALER_EXCHANGE_free_reserve_history (len,
+                                           rhistory);
       GNUNET_JSON_parse_free (spec);
       return GNUNET_SYSERR;
     }
@@ -142,8 +142,8 @@ handle_reserves_status_ok (struct TALER_EXCHANGE_ReservesStatusHandle *rsh,
                &rs);
       rsh->cb = NULL;
     }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
+    TALER_EXCHANGE_free_reserve_history (len,
+                                         rhistory);
   }
   return GNUNET_OK;
 }
diff --git a/src/lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c
index ef160a097..a428f9fb8 100644
--- a/src/lib/exchange_api_wire.c
+++ b/src/lib/exchange_api_wire.c
@@ -273,8 +273,8 @@ handle_wire_finished (void *cls,
         if (GNUNET_OK !=
             TALER_EXCHANGE_parse_accounts (&master_pub,
                                            accounts,
-                                           was,
-                                           wr.details.ok.accounts_len))
+                                           wr.details.ok.accounts_len,
+                                           was))
         {
           GNUNET_break_op (0);
           wr.hr.http_status = 0;
@@ -286,8 +286,9 @@ handle_wire_finished (void *cls,
                   &wr);
           wh->cb = NULL;
         }
-        TALER_EXCHANGE_free_accounts (was,
-                                      wr.details.ok.accounts_len);
+        TALER_EXCHANGE_free_accounts (
+          wr.details.ok.accounts_len,
+          was);
       } /* end of 'parse accounts */
       free_fees (fbm,
                  wr.details.ok.fees_len);
diff --git a/src/lib/exchange_api_withdraw2.c b/src/lib/exchange_api_withdraw2.c
index 11028ed5b..bf9e2c091 100644
--- a/src/lib/exchange_api_withdraw2.c
+++ b/src/lib/exchange_api_withdraw2.c
@@ -202,12 +202,12 @@ reserve_withdraw_payment_required (
                                               rhistory))
     {
       GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
+      TALER_EXCHANGE_free_reserve_history (len,
+                                           rhistory);
       return GNUNET_SYSERR;
     }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
+    TALER_EXCHANGE_free_reserve_history (len,
+                                         rhistory);
   }
 
   /* Check that funds were really insufficient */
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c b/src/testing/testing_api_cmd_batch_withdraw.c
index 9283f0325..56af70b14 100644
--- a/src/testing/testing_api_cmd_batch_withdraw.c
+++ b/src/testing/testing_api_cmd_batch_withdraw.c
@@ -326,8 +326,8 @@ batch_withdraw_run (void *cls,
     TALER_TESTING_get_exchange_url (is),
     TALER_TESTING_get_keys (is),
     rp,
-    wcis,
     ws->num_coins,
+    wcis,
     &reserve_batch_withdraw_cb,
     ws);
   if (NULL == ws->wsh)