Changed define-* macros to expand to eval-when