diff --git a/wallet/wallet.c b/wallet/wallet.c
index bec2d41b7..b318a8f27 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -1679,6 +1679,12 @@ static struct wallet_payment *wallet_stmt2payment(const tal_t *ctx,
 	return payment;
 }
 
+/* List of the fields that stmt2payment expects to correctly convert */
+#define PAYMENT_FIELDS                                                         \
+	"id, status, destination, msatoshi, payment_hash, timestamp, "         \
+	"payment_preimage, path_secrets, route_nodes, route_channels, "        \
+	"msatoshi_sent, description "
+
 struct wallet_payment *
 wallet_payment_by_hash(const tal_t *ctx, struct wallet *wallet,
 		       const struct sha256 *payment_hash)
@@ -1691,13 +1697,8 @@ wallet_payment_by_hash(const tal_t *ctx, struct wallet *wallet,
 	if (payment)
 		return payment;
 
-	stmt = db_prepare(wallet->db,
-			  "SELECT id, status, destination,"
-			  "msatoshi, payment_hash, timestamp, payment_preimage, "
-			  "path_secrets, route_nodes, route_channels, "
-			  "msatoshi_sent, description "
-			  "FROM payments "
-			  "WHERE payment_hash = ?");
+	stmt = db_prepare(wallet->db, "SELECT " PAYMENT_FIELDS " FROM payments "
+				      "WHERE payment_hash = ?");
 
 	sqlite3_bind_sha256(stmt, 1, payment_hash);
 	if (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -1889,22 +1890,13 @@ wallet_payment_list(const tal_t *ctx,
 
 	payments = tal_arr(ctx, const struct wallet_payment *, 0);
 	if (payment_hash) {
-		stmt = db_prepare(
-			wallet->db,
-			"SELECT id, status, destination, "
-			"msatoshi, payment_hash, timestamp, payment_preimage, "
-			"path_secrets, route_nodes, route_channels "
-			"FROM payments "
-			"WHERE payment_hash = ?;");
+		stmt = db_prepare(wallet->db,
+				  "SELECT " PAYMENT_FIELDS " FROM payments "
+				  "WHERE payment_hash = ?;");
 		sqlite3_bind_sha256(stmt, 1, payment_hash);
 	} else {
-		stmt = db_prepare(
-			wallet->db,
-			"SELECT id, status, destination, "
-			"msatoshi, payment_hash, timestamp, payment_preimage, "
-			"path_secrets, route_nodes, route_channels, "
-			"msatoshi_sent "
-			"FROM payments;");
+		stmt = db_prepare(wallet->db,
+				  "SELECT " PAYMENT_FIELDS " FROM payments;");
 	}
 
 	for (i = 0; sqlite3_step(stmt) == SQLITE_ROW; i++) {