Given that we've got a proper HREF set on the element now, can we do away with the `shortname` and link building here?