Create clang scopes in more cases