Tidy Links

Included in:

Shorter links.