ruff

[ty] fix a couple latent bugs uncovered during `nonlocal` work

#19336

Merged