cleanup/simplify namespace usage in ObjectVariantMapper