PIM-1526 : Decrease UniqueVariantAxisValidator complexity