more complete eol handling