Use older-style dict comprehensions that will work with python 2.6+