More ObjectVariantMapper cleanups