Minor changes to get ready for OpenGL 2.1.