Simplify wraps, #2.