Fix up the handling of end-of-line comments if there's white space