Do some hard line-wrapping and fix some fallout from it.