[merge] Remove Python 2.7 dict comprehension syntax

Hopefully 2.6-happy again.