Some cleanup, and add -l option, which adds #line C preprocessor directives