MNT: Segregated classes and functions for wrapping
ENH: Re-implemented auto-wrapping of functions