Made 'correct' variant-aware.

[SVN r86414]