All sets that need to be iterated as part of bundle-set creation need to
be linked-sets, so we don't end up with non-deterministic behavior, and
adding to set we are iterating needs to be avoided by copy the set
before iterating it.
Fixed a part of a guard that I wasn't easily able to create a test for
using our spec test framework.