Convert map/filter into list comprehensions (STOX-24)
Merge branch 'stox-24'