Refactoring for using VariantNonRef