Fixes SerializationTest failure since EFactoryDerivedStateComputer.
(The testReferenceTest is still red, but it used to be before
EFactoryDerivedStateComputer already, that's up next.)