Avoid dict comprehension syntax for Python 2.6 compatibility.

Dict comprehensions are a Python 2.7 feature, see
https://docs.python.org/3/whatsnew/2.7.html#python-3-1-features