Fix handling of scopes in xlib names.