Allowing decrementing of macros, help additions, removing unneeded deps