Revert "combine loaded sets so we only enumerate once"

This reverts commit d4456c24b0df29359c520ce778e4682b85146245.
minor cleanup as discussed under #1927