Fix the composition of mutually recursive functions: now tests are green
again.