Convert CanonicalValue{Support,Validator} to use Variant