shrink-wrap: Remove complicated simple_return manipulations