u/danielw/dm-1395

Creating PR for reviewing DM-1395
I guess. I'll change it, although `map` still reads better to me.