Upgrade to newest codegen.js