Avoid dict comprehension, not supported in 2.6.

Also, fixed a typo.