Fix to regexes: add digits to word chars (\w, \<, \>).