Looks a bit unrelated, right? Mind opening issue for changing all HandleScopes in this file?