Remove dict comprehension for Python2.6 compatibility