Temp: Use dictionary comprehension.