Made covered_by variant-aware.

[SVN r86461]