Variant now uses likely_type