cleanup function names, and use 2 hashes for string dedup: one utf8, one non utf8