Do pass the variables around to the evaluator

Not that at the moment we have not implemented the resoution of the
variable reference. So that explains why it did not make a difference