Merge "py3: Replace map/filter with a list comprehension"