Unicode*: fix visitors
Unicode*: rewrite using CustomMatcher...

No need to duplicate its work.
Modify two visitors to account for Unicode

And fix a compile error too...