Ported to latest gl_generator.  This fixes #2