Link disambiguators

[petebacondarwin]

This is an alternative approach to some of #1846

[googlebot]

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

[googlebot]

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

[googlebot]

CLAs look good, thanks!

[googlebot]

CLAs look good, thanks!

[chalin]

LGTM. Lovely clean design!
Supersedes #1846 (to be refactored and closed soon).

[wardbell]

Merging on @chalin approval.