Migrate to use the full e4c library, for thread safety