One new driver and some nice cleanups.