What a mess...
Tried to remove generics from operators but then you can't override call/call1/call2 with the right subtype of MarbleModel.
Tried adding generics to MarbleDiagramModel and everything else. That became too much trouble.