             return editableRegions
         }
     }
-    public var reorderableRegions = [(Int?, OmnibarRegion)]()
-    public var editableRegions = [(Int?, OmnibarRegion)]()
+    public var reorderableRegions = [IndexedRegion]()
+    public var editableRegions = [IndexedRegion]()
 
     public var currentTextPath: NSIndexPath?
 

    }

    public func scrollViewDidScroll(scrollView: UIScrollView) {
        if scrollView == regionsTableView {
        }
        else {
            regionsTableView.contentOffset = scrollView.contentOffset
        }
    }

    // The textContainer is the outer gray background.  The text view is
    // configured to fill that container (only the container and the text view
    // insets are modified in layoutSubviews)
    private func setupTableViews() {
        regionsTableView.dataSource = self
        regionsTableView.delegate = self
        regionsTableView.separatorStyle = .None
