Adjusted context scope handling.