Prep to possibly remove ThreadedWebDriver class.