New upstream fixed usage of letrec