Moved more things to the X11 driver.