Having magic names show up in my code without an explicit import somewhere can be really frustrating, especially in unfamiliar code bases where I'm trying to contribute a small change.

I think your suggestions do a good job addressing that; could be a thing for a style guide.