Some reshuffling to structure things more along the OpenGL 4.4 spec.