Loaded up a save before Morgarith's punishment. Went back to school even though I'd already been there. Went to another lecture, found the girls flashing gallery event, and then the double gloryhole event with Viki. Also bought a skirt for work. One of those things seemed to work--seemed to not trigger Morgarith's punishment that night. But what that suggests is that there are problems with non-obvious lecture sessions needing to be attended, that make it possible to trigger Morgarith's punishment... or something.