Add 'current context' to helper args

That was easier than I expected…