         let dropTemp = "DROP TABLE \(tmpTable)"
 
         // Now run these.
-        if !self.run(db, queries: [(domains, nil),
-                                   (domainIDs, nil),
-                                   (updateHistory, nil),
-                                   (dropTemp, nil)]) {
+        if !self.run(db, queries: [domains,
+                                   domainIDs,
+                                   updateHistory,
+                                   dropTemp]) {
             log.error("Unable to migrate domains.")
             return false
         }


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

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

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


    func drop(db: SQLiteDBConnection) -> Bool {
        log.debug("Dropping all browser tables.")
        let additional = [
            "DROP TABLE IF EXISTS faviconSites" // We renamed it to match naming convention.
        ]

        let queries = AllViews.map { "DROP VIEW IF EXISTS \($0!)" } +
                      AllIndices.map { "DROP INDEX IF EXISTS \($0!)" } +
                      AllTables.map { "DROP TABLE IF EXISTS \($0!)" } +
                      additional

        return self.run(db, queries: queries)
