Fixed `defmacro` issues.