Simplified several macros via the introduction of define-gensyms.