uv

Improve self-dependency hint to make shadowing clear

#9716

Merged