their own line, instead, just break them at the end of the line and continue.

Also, fix a bug where the intended "check next character" test was actually
checking the last characer.

Finally, use a common slightly wrong word-length calculating function rather
than custom-rolled mildly wrong stuff in-line.