Avoid dictionary comprehension

Introduced in Python 2.7.
I could just require 2.7 and up, I guess, but this seems
so minor, I might as well.