Remove extra LF.
Inline comment corrections.
Preserve backwards compatibility.