fixup! Refactor PCI device creation