General rework of some of the Iris driver code. (dm)