Fixed folding of inner loop values and started enhanced CFG calculation