merge Context and ExecState -- there's no real benefit from these being two separate classes
Created attachment 16877 [details] the patch