Start of cleaned-up, forward-ported drivers.