fix contextual folding for new foldexpr