Scottstamp stale links pr carry

squash and carry @scottstamp's PR #9646

and then fix the other things his script found.