[#1990] Improve support for links.