gh-156466: Fix additional compiler scope cleanup errors (#156547)
2 files changed