And likewise for `yield`, which perhaps deserves its own pull request (since that's a bug in the existing code).