more cleanups to ObjectVariantMapper - type registry