Easier handling of context variables

Sorry, I wasn’t aware of this thread and thus commented on Github. I think that, if a pull request exists, we should generally discuss code there, what do you think?

Anyway, I left another comment with a suggestion there.