Remove dependence on DEFMACRO-ENHANCE