Improved row wrapping.