Fixups to bitrot in the conduit stuff.  High-level control structure.