Use a dictionary comprehension

Per Eben's suggestion. Definitely more legible.