costmetic cleanusp to ObjectVariantMapper and one important fix to ObjectVariantMapper_TYPEINFO_Construction_Helper Macro