Remove comment.
Rename core stuff that gets wrapped later to __foo.
Rename --macro to make-macro-expander.
Merge branch 'master' into gh-pages