Fix three more kinds of purported line breaks