Also, can we move this somewhere as a non-inlined method? Seems very related to the other wrap method below.