Doing more work on code generation, tree manipulation, etc