Switch to using an improved regex expr for links