Bring back unicode helper and use it for stricter matching.