Wrappers simplification

This simplifies several hacks in the wrappers.