Fix another bug caused by tree-trimming
Missing CompExpr clause in trafo, fix IfStatement