Have to do dictionary comprehension in a 2.6 compat way