Bug fix and a few new macros.
Manually expanded uses of SETF macros.