@raoulb Should this happen automatically?? I think it should be under eval_expand_func.