Reduce the number of indirections
Fix letrec
Report heap size also