Move things around a bit to reduce the number of layers. Update rglossa.