Fix: Python 2.6 has no dict comprehensions