Could you please review this with extra scrutiny? I think I got it right, and it fixes #2263, but I might not know something.