Previously (before fetching the latest seabios/master) our bootorder file looked like this

/pci@i0cf8/usb@12,2/*@4
/pci@i0cf8/usb@12,2/*@5
/pci@i0cf8/usb@12,2/*@3
/pci@i0cf8/usb@12,2/*@2
/pci@i0cf8/usb@12,2/*@1
/pci@i0cf8/usb@12,2/*@0

Now it looks like this. This also includes devices plugged into hubs on two of the ports.
(Thank you to whoever got hubs working)

/pci@i0cf8/usb@12,2/storage@5/*@0/*@0,0
/pci@i0cf8/usb@12,2/storage@4/*@0/*@0,0
/pci@i0cf8/usb@12,2/storage@3/*@0/*@0,0
/pci@i0cf8/usb@12,2/storage@2/*@0/*@0,0
/pci@i0cf8/usb@12,2/storage@1/*@0/*@0,0
/pci@i0cf8/usb@12,2/storage@0/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@4/storage@1/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@4/storage@2/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@4/storage@3/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@4/storage@4/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@1/storage@1/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@1/storage@2/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@1/storage@3/*@0/*@0,0
/pci@i0cf8/usb@12,2/hub@1/storage@4/*@0/*@0,0

Is there an easier/generic way to condense this down?
Is there any kind of wildcard support when it comes to adding any USB device?

Thanks in advance,
Dave