Python 2.6 fix

Replaced dictionary comprehensions with list comprehensions fed into the dict constructor.