reverting dict comprehension back to 2.6 format (attempt #2)