Small fixes in line breaking.

Including the one that was pointed out in #426.