Less broken handling of comprehensions.