If we'll agree that `context` proposed in #1214 is a good way to go, I think it would make a lot more sense to convert this to context as well. Not saying we have to, or that we should wait on resolution on the `context` subject, it's just be prepared that we may have to adjust this later, unless you disagree in regards that `context` here would make sense.