Fold StateVar, ObjectName, and Tensor back into the OpenGL package