gh-144386: Update equivalent code for "with", "async with" and "async for"

gh-144386: Update equivalent code for "with", "async with" and "async for" #8915