COMPILER: Improve curryfication 2