More clenaups of ObjectVariantMapper