All the mechanism was there, but it wasn't being use for the name-shadowing test. MERGED from commit b2e8bed8