Changed how variants are handled.