Support Python 2.6 by avoiding dictionary comprehensions