Avoid dict comprehension to support Python 2.5