Eradicating "EC_"; only 3 hits in the codebase any more.