Unifying text normalization with other code.
Merge branch 'regex-cleanup' into peerlibrary