         }
 
         if from < 5 && to >= 5  {
-            let queries: [(String?, Args?)] = [(getQueueTableCreationString(forVersion: to), nil)]
+            let queries: [String?] = [getQueueTableCreationString(forVersion: to)]
             if !self.runValidQueries(db, queries: queries) {
                 return false
             }

        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),
        ]

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


    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)
