Extensions to `macros.el'