Reworking broken match and notmatch code
make all matches and notmatches arrays of regex and exact match strings

...because consistency and explicitness