So should we actually be looking for \r\n rather than skipping \r and
splitting on \n?