re-fixing case expressions. universe bugs on bigger examples.