Oh, and for non-x86 platforms with interesting pci
mapping, this tweak to one new routine would be
important in a particular error path I've yet to see ... :)