Remove locale-dependence of enum mangling and use existing function.