Make defmacro compatible with new emitter