Simplifying the wrapper map