My recent surgery on metamodel code has led to some WrongClassExceptions for discriminated subclasses. Need to track down the cause.