- Remove dict comprenension in util, for 2.6 compat.