[MOD] Separate tail call into separate method.