Fix the broken link parsing, but with some side effects. This will bear revisiting.