Warning fixes and some slight modernisations.
Matcher using modern reg exp API.