Pass expressions to modifier builder in the original form

We do not really need tthis conversion anyway, because expressions won't be included in the final cache, also this will make easier to use modifier builder separately from Eos