Minor refactoring in GLUS.