diff --git a/federationapi/storage/postgres/assumed_offline_table.go b/federationapi/storage/postgres/assumed_offline_table.go
index f102c092e..a83a934c3 100644
--- a/federationapi/storage/postgres/assumed_offline_table.go
+++ b/federationapi/storage/postgres/assumed_offline_table.go
@@ -60,19 +60,12 @@ func NewPostgresAssumedOfflineTable(db *sql.DB) (s *assumedOfflineStatements, er
 		return
 	}
 
-	if s.insertAssumedOfflineStmt, err = db.Prepare(insertAssumedOfflineSQL); err != nil {
-		return
-	}
-	if s.selectAssumedOfflineStmt, err = db.Prepare(selectAssumedOfflineSQL); err != nil {
-		return
-	}
-	if s.deleteAssumedOfflineStmt, err = db.Prepare(deleteAssumedOfflineSQL); err != nil {
-		return
-	}
-	if s.deleteAllAssumedOfflineStmt, err = db.Prepare(deleteAllAssumedOfflineSQL); err != nil {
-		return
-	}
-	return
+	return s, sqlutil.StatementList{
+		{&s.insertAssumedOfflineStmt, insertAssumedOfflineSQL},
+		{&s.selectAssumedOfflineStmt, selectAssumedOfflineSQL},
+		{&s.deleteAssumedOfflineStmt, deleteAssumedOfflineSQL},
+		{&s.deleteAllAssumedOfflineStmt, deleteAllAssumedOfflineSQL},
+	}.Prepare(db)
 }
 
 func (s *assumedOfflineStatements) InsertAssumedOffline(
diff --git a/federationapi/storage/sqlite3/assumed_offline_table.go b/federationapi/storage/sqlite3/assumed_offline_table.go
index b0967cf6f..6c5c6c139 100644
--- a/federationapi/storage/sqlite3/assumed_offline_table.go
+++ b/federationapi/storage/sqlite3/assumed_offline_table.go
@@ -72,7 +72,13 @@ func NewSQLiteAssumedOfflineTable(db *sql.DB) (s *assumedOfflineStatements, err
 	if s.deleteAllAssumedOfflineStmt, err = db.Prepare(deleteAllAssumedOfflineSQL); err != nil {
 		return
 	}
-	return
+
+	return s, sqlutil.StatementList{
+		{&s.insertAssumedOfflineStmt, insertAssumedOfflineSQL},
+		{&s.selectAssumedOfflineStmt, selectAssumedOfflineSQL},
+		{&s.deleteAssumedOfflineStmt, deleteAssumedOfflineSQL},
+		{&s.deleteAllAssumedOfflineStmt, deleteAllAssumedOfflineSQL},
+	}.Prepare(db)
 }
 
 func (s *assumedOfflineStatements) InsertAssumedOffline(
diff --git a/relayapi/storage/postgres/relay_queue_json_table.go b/relayapi/storage/postgres/relay_queue_json_table.go
index c3e1858f1..504d557b4 100644
--- a/relayapi/storage/postgres/relay_queue_json_table.go
+++ b/relayapi/storage/postgres/relay_queue_json_table.go
@@ -64,16 +64,12 @@ func NewPostgresRelayQueueJSONTable(db *sql.DB) (s *relayQueueJSONStatements, er
 	if err != nil {
 		return
 	}
-	if s.insertJSONStmt, err = s.db.Prepare(insertQueueJSONSQL); err != nil {
-		return
-	}
-	if s.deleteJSONStmt, err = s.db.Prepare(deleteQueueJSONSQL); err != nil {
-		return
-	}
-	if s.selectJSONStmt, err = s.db.Prepare(selectQueueJSONSQL); err != nil {
-		return
-	}
-	return
+
+	return s, sqlutil.StatementList{
+		{&s.insertJSONStmt, insertQueueJSONSQL},
+		{&s.deleteJSONStmt, deleteQueueJSONSQL},
+		{&s.selectJSONStmt, selectQueueJSONSQL},
+	}.Prepare(db)
 }
 
 func (s *relayQueueJSONStatements) InsertQueueJSON(
diff --git a/relayapi/storage/postgres/relay_queue_table.go b/relayapi/storage/postgres/relay_queue_table.go
index c2ca78c6f..e49eae923 100644
--- a/relayapi/storage/postgres/relay_queue_table.go
+++ b/relayapi/storage/postgres/relay_queue_table.go
@@ -74,19 +74,13 @@ func NewPostgresRelayQueueTable(db *sql.DB) (s *relayQueueStatements, err error)
 	if err != nil {
 		return
 	}
-	if s.insertQueueEntryStmt, err = s.db.Prepare(insertQueueEntrySQL); err != nil {
-		return
-	}
-	if s.deleteQueueEntriesStmt, err = s.db.Prepare(deleteQueueEntriesSQL); err != nil {
-		return
-	}
-	if s.selectQueueEntriesStmt, err = s.db.Prepare(selectQueueEntriesSQL); err != nil {
-		return
-	}
-	if s.selectQueueEntryCountStmt, err = s.db.Prepare(selectQueueEntryCountSQL); err != nil {
-		return
-	}
-	return
+
+	return s, sqlutil.StatementList{
+		{&s.insertQueueEntryStmt, insertQueueEntrySQL},
+		{&s.deleteQueueEntriesStmt, deleteQueueEntriesSQL},
+		{&s.selectQueueEntriesStmt, selectQueueEntriesSQL},
+		{&s.selectQueueEntryCountStmt, selectQueueEntryCountSQL},
+	}.Prepare(db)
 }
 
 func (s *relayQueueStatements) InsertQueueEntry(
diff --git a/relayapi/storage/sqlite3/relay_queue_json_table.go b/relayapi/storage/sqlite3/relay_queue_json_table.go
index 1635847a7..e5cff0563 100644
--- a/relayapi/storage/sqlite3/relay_queue_json_table.go
+++ b/relayapi/storage/sqlite3/relay_queue_json_table.go
@@ -64,10 +64,10 @@ func NewSQLiteRelayQueueJSONTable(db *sql.DB) (s *relayQueueJSONStatements, err
 	if err != nil {
 		return
 	}
-	if s.insertJSONStmt, err = db.Prepare(insertQueueJSONSQL); err != nil {
-		return
-	}
-	return
+
+	return s, sqlutil.StatementList{
+		{&s.insertJSONStmt, insertQueueJSONSQL},
+	}.Prepare(db)
 }
 
 func (s *relayQueueJSONStatements) InsertQueueJSON(
diff --git a/relayapi/storage/sqlite3/relay_queue_table.go b/relayapi/storage/sqlite3/relay_queue_table.go
index fdaa57f00..89bd11b93 100644
--- a/relayapi/storage/sqlite3/relay_queue_table.go
+++ b/relayapi/storage/sqlite3/relay_queue_table.go
@@ -75,19 +75,12 @@ func NewSQLiteRelayQueueTable(db *sql.DB) (s *relayQueueStatements, err error) {
 	if err != nil {
 		return
 	}
-	if s.insertQueueEntryStmt, err = db.Prepare(insertQueueEntrySQL); err != nil {
-		return
-	}
-	//if s.deleteQueueEntriesStmt, err = db.Prepare(deleteQueueEntriesSQL); err != nil {
-	//	return
-	//}
-	if s.selectQueueEntriesStmt, err = db.Prepare(selectQueueEntriesSQL); err != nil {
-		return
-	}
-	if s.selectQueueEntryCountStmt, err = db.Prepare(selectQueueEntryCountSQL); err != nil {
-		return
-	}
-	return
+
+	return s, sqlutil.StatementList{
+		{&s.insertQueueEntryStmt, insertQueueEntrySQL},
+		{&s.selectQueueEntriesStmt, selectQueueEntriesSQL},
+		{&s.selectQueueEntryCountStmt, selectQueueEntryCountSQL},
+	}.Prepare(db)
 }
 
 func (s *relayQueueStatements) InsertQueueEntry(