Tweak the set comprehensions