inner function, without creating a special type of function. This reduced
understanding complexity, but also reduced a potential source of bugs ( when
unpickling, or having alias outputs). I also added a new test for the bug
Arnaud discovered, which this fix also adresses in a more broad way.