More tweaks to the anonymizer.