I tried to make this bugfix easy to review with tests/comments.
Is this the best place to ask for PR review?