More, minimal refactoring of GLUS. Preparing for GLUS 2.0.