Drop even more set and dict comprehensions