Python 2.6 support: Swapped dict comprehensions with 'dict((k, v) for k, v in  ...'