             "iconDate REAL, " +
             "iconType INTEGER, " +
             "iconWidth INTEGER, " +
-            "frecencies REAL)"
-    }
-
-    func getDomainsTableCreationString() -> String {
-        return "CREATE TABLE IF NOT EXISTS \(TableDomains) (" +
-                   "id INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                   "domain TEXT NOT NULL UNIQUE, " +
-                   "showOnTopSites TINYINT NOT NULL DEFAULT 1" +
-               ")"
-    }
-
-    func getQueueTableCreationString() -> String {
-        return "CREATE TABLE IF NOT EXISTS \(TableQueuedTabs) (" +
-                   "url TEXT NOT NULL UNIQUE, " +
-                   "title TEXT" +
-               ") "
-    }
+            "frecencies REAL" +
+        ")"
+
+    let domainsTableCreate =
+        "CREATE TABLE IF NOT EXISTS \(TableDomains) (" +
+           "id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+           "domain TEXT NOT NULL UNIQUE, " +
+           "showOnTopSites TINYINT NOT NULL DEFAULT 1" +
+       ")"
+
+    let queueTableCreate =
+        "CREATE TABLE IF NOT EXISTS \(TableQueuedTabs) (" +
+            "url TEXT NOT NULL UNIQUE, " +
+            "title TEXT" +
+        ") "
 
     func getBookmarksMirrorTableCreationString() -> String {
         // The stupid absence of naming conventions here is thanks to pre-Sync Weave. Sorry.

            if !self.run(db, queries: [
                "DROP INDEX IF EXISTS \(IndexVisitsSiteIDDate)",
                "CREATE INDEX IF NOT EXISTS \(IndexVisitsSiteIDIsLocalDate) ON \(TableVisits) (siteID, is_local, date)",
                getDomainsTableCreationString(),
                "ALTER TABLE \(TableHistory) ADD COLUMN domain_id INTEGER REFERENCES \(TableDomains)(id) ON DELETE CASCADE",
            ]) {
                return false

            widestFavicons,
            historyIDsWithIcon,
            iconForURL,
            self.queueTableCreate,
            self.topSitesTableCreate,
        ]

        assert(queries.count == AllTablesIndicesAndViews.count, "Did you forget to add your table, index, or view to the list?")
