Restore a few macros that were lost in the way.