The first case in the issue can be fixed by this commit.
For the second one I tried this, but I'm not sure. In my understanding, if a definition node is not a dependency of the entrypoint, we should not add it. The condition not (name in variable_names) should be removed.

Would also be nice if you can submit another PR to add a test case at: https://github.com/evalplus/evalplus/blob/master/tests/test_treesitter_sanitizer.py