DRY'd up ShrinkWrapUtil.  Removed dead code.