More work on GL.state.