Partial fix for FS#12289 - comment lines would waste lots of buffer space. Still...