Get rid of unused command-line argument
Minor rename
Add a command-line switch for embedding macros in output
Use DEFVAR instead of SET for readability
Moved code
Use LET