Make anonymizer more robust.
Anonymizer tweaks.