Wrap dictionary comps in dict for 2.6