Remove dict comprehensions. Python 2.6.x compatible