Further tweaks to wrapping.