Better support for soft wrapping.