The wrapper stuff is no longer necessary.