 
     func drop(db: SQLiteDBConnection) -> Bool {
         log.debug("Dropping all browser tables.")
-        let additional: [(String, Args?)] = [
-            ("DROP TABLE IF EXISTS faviconSites", nil) // We renamed it to match naming convention.
+        let additional = [
+            "DROP TABLE IF EXISTS faviconSites" // We renamed it to match naming convention.
         ]
 
-        let queries: [(String, Args?)] = AllViews.map { ("DROP VIEW IF EXISTS \($0!)", nil) } as [(String, Args?)] +
-                      AllIndices.map { ("DROP INDEX IF EXISTS \($0!)", nil) } as [(String, Args?)] +
-                      AllTables.map { ("DROP TABLE IF EXISTS \($0!)", nil) } as [(String, Args?)] +
+        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)

        }

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

        let indexStructureParentIdx = "CREATE INDEX IF NOT EXISTS \(IndexBookmarksMirrorStructureParentIdx) " +
            "ON \(TableBookmarksMirrorStructure) (parent, idx)"

        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?")
