Reorganization of the wrappers' code.