>> We call it again in do_discover. > > Do we? At least in my copy of the tree we don't, and given that > connect_ctrl builds the argstr differently that would be a bad idea.. I wasn't rebased... you can discard this one...