What I have done is to enable that functions could return evaluable objects themselves, see the new test case.