Made disjoint variant-aware.

[SVN r86523]