more refactoring in private parts of  ObjectVariantMapper