Improvements to support switch to Kean.Draw.OpenGL.