Parameterise the regex we use pretty much everywhere
Lint fixes