Remove more redundant list comprehensions