Updated with JSDoc fixes for generator.js