Attached patch fixes this, but here's a question:  Is it possible to 
have multiple name qualifications like "A::B::whatever"?  If so, this 
path will have to be tweaked to address that.