Some tweaks to new visual wrap.