Forward port Paul's latest fixes from 2.4. This driver still need
significant work to fit into the "macio" model properly, among
others.