         let indexStructureParentIdx = "CREATE INDEX IF NOT EXISTS \(IndexBookmarksMirrorStructureParentIdx) " +
             "ON \(TableBookmarksMirrorStructure) (parent, idx)"
 
-        let queries: [(String?, Args?)] = [
-            (getDomainsTableCreationString(forVersion: version), nil),
-            (getHistoryTableCreationString(forVersion: version), nil),
-            (favicons, nil),
-            (visits, nil),
-            (bookmarks, nil),
-            (bookmarksMirror, nil),
-            (bookmarksMirrorStructure, nil),
-            (indexStructureParentIdx, nil),
-            (faviconSites, nil),
-            (indexShouldUpload, nil),
-            (indexSiteIDDate, nil),
-            (widestFavicons, nil),
-            (historyIDsWithIcon, nil),
-            (iconForURL, nil),
-            (getQueueTableCreationString(forVersion: version), nil),
-            (getTopSitesTableCreationString(forVersion: version), nil),
+        let queries: [String?] = [
+            getDomainsTableCreationString(forVersion: version),
+            getHistoryTableCreationString(forVersion: version),
+            favicons,
+            visits,
+            bookmarks,
+            bookmarksMirror,
+            bookmarksMirrorStructure,
+            indexStructureParentIdx,
+            faviconSites,
+            indexShouldUpload,
+            indexSiteIDDate,
+            widestFavicons,
+            historyIDsWithIcon,
+            iconForURL,
+            getQueueTableCreationString(forVersion: version),
+            getTopSitesTableCreationString(forVersion: version),
         ]
 
         assert(queries.count == AllTablesIndicesAndViews.count, "Did you forget to add your table, index, or view to the list?")

        let dropTemp = "DROP TABLE \(tmpTable)"

        // Now run these.
        if !self.run(db, queries: [(domains, nil),
                                   (domainIDs, nil),
                                   (updateHistory, nil),
                                   (dropTemp, nil)]) {
            log.error("Unable to migrate domains.")
            return false
        }


        if from < 6 && to >= 6 {
            if !self.run(db, queries: [
                "DROP INDEX IF EXISTS \(IndexVisitsSiteIDDate)",
                "CREATE INDEX IF NOT EXISTS \(IndexVisitsSiteIDIsLocalDate) ON \(TableVisits) (siteID, is_local, date)",
            ]) {
                return false
            }
        }

        if from < 7 && to >= 7 {
            let queries: [String?] = [
                getDomainsTableCreationString(forVersion: to),
                "ALTER TABLE \(TableHistory) ADD COLUMN domain_id INTEGER REFERENCES \(TableDomains)(id) ON DELETE CASCADE",
            ]

            if !self.runValidQueries(db, queries: queries) {
