apiGenerator: fix call convention problems
Merge branch 'master' into property-bag-element-accessor-aliases