Fixed defmacros/undefmacros clash in CleverExtension.