Restore sxr support and fix links to sxr'd sources.  Fixes #863.