fix not to use reserved words: __foo and this
Merge branch 'dev-transform-struct'