Only process webdriver options when meaningful

Also some general code cleanup, and dependencies are now locked down.