Fixes related to integration testing

While integration testing I discovered that you cannot have ChoiceOf(SetOf(...), ...). Foolscap explodes with an assertion error in the implementation of SetOf when it is given the wrong constraint object.