Crap.  Disregard my comments above about removing support for multiple devices.  I'm not sure I like how it's done terribly much.