Remove cwrap, and replace it with an overloaded wrap.