Work on #504.  Don't assume a newline is only one character (stupid
windows).