More reorganization of the Iris driver. (dm)