Updated to use the abstracted link-extraction module.

  Rather than having our own parser.