Replace some use of variant with covariant

[ehuss]

Thanks! This looks good to me, but I'd like to see if someone else can weigh in.