Fix more issues with spacing during text wrapping.