A lot of code cleanup in the driver. Still a ways to go.