Fixing tail calls.