More QVariant migration