Re-write 2.6-incompatible dict comprehensions