Pre-calculate type before invoking getTypeNoCheck() if required, MPS-17671
Better fix for MPS-17726; fixing tests
MPS-17955 StubModelEntries are added to msd file without my permission.