Removed dict comprehension for Python 2.6 compatibility.