Same deal here as in the other pull request. This doesn't need to be a set.