Same for those generator expressions, we try to change as little as possible on feature patches.