GLX refactor.