Tweaks to variant_conversion_helper<any>