Move Conpherence to "Zxxx" only, not "Exxx"

Summary: Fixes T7439. Also two callsites I missed earlier.

Test Plan: Tried to search for strings like 'E and "E.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T7439

Differential Revision: https://secure.phabricator.com/D12616