What worries me in eeac1ca is it will drop tags where explicit scope gets removed by e.g.
Good point, it can be annoying
But maybe it could work like scope completion does now - first show a popup with narrowed selection and if what has been typed doesn't match anything in the popup any more, switch back to normal autocompletion.
That's what it does now for the autocomplete AFAICT. But not for calltips I think.