Remove archaic use of regex capture \1 in favour of $1