[#883465] Ensure our tool links go to the correct spots, once those spots exist.