Yeah, I know. Fixing it involves some unrelated refactoring, which is a distraction from this PR. I'll follow up with a PR just for that after this is pulled.