More clean up in AST nodes to code; fix regressions
Merge pull request #133 from ke-yu/StableBranchWithTestcases

More clean up in AST nodes to code; fix regressions