One new driver and a couple of nice cleanups.