Some macro-expansion fixes.
Explosion at the macro expansion factory.
Death to varbookmark and other stories.