Change the _wrap logic to be less magical