Updates for BarcodeVariant support.