Moved more code to the X11 driver.