more cleanups on ObjectVariantMapper