The existing code sometimes refer to ControlFlowContext (and associated references) as context, and sometimes as scope. Let's be consistent and always call it a scope.
Created attachment 296953 [details] proposed patch.
Comment on attachment 296953 [details] proposed patch. r=me.
I just realized that I described the motivation for this patch in this bugzilla but forgot to add it to the ChangeLog. I've updated the ChangeLog to include this. Landed in r209728: <http://trac.webkit.org/r209728>.