Normalizing all matches in preparation for automatic generation

* Match output is now pretty well normalized
* All matches now use `regex`, no more `wholewords`.