minor cleanups and containers::Optional support in ObjectVariantMapper