resolve notation clash
fix some bugs in ANF syntax