Use dict comprehensions

7 jobs for !3465 with noc-dict-comprehensions in 11 minutes and 58 seconds (queued for 1 second)
merge request