More dict comprehension removal