Optimize self tail calls