Undo simplification of tail calls (commit 901d760)

Not that simpler and slower.
3 files changed