Making 'str' own condition rather than just fallback from 're'.
Tidying comment and generalising location, trivial.