To minimize merge conflicts, I'm capturing the line wraps in a
separate commit, and will start tackling my edits in the next commit.