Slightly smarter handling of "driver" setting.