Changed set() plus a list comprehension to a dictionary comprehension.