Update for gl_generator's new code generation model