Now handling ragged comment lines better.