Roger: I believe I fixed the line wrap issue. See comment in this commit.