Baaaaaaaaaaaaaaaaaaaaaah.
So usb_modeswitch was breaking it? Maybe? And fouled all my tests today? So I'm at a frustrated square one.