Improve logic for parsing link info from infoboxes.