Editorial: be more consistent about the context object

And in general be more explicit about the objects involved.