This looks unnecessary - CVariant is safe to query in this fashion I think?

@Montellese mind commenting?