Fix line stripping

The mismatch between having the comment header and not having it made
the line stripping count off.  Now we always write the comment.
Make numbers not as strict

This will help with evars.  Perhaps we should restrict the number
replacement only to evars?