Clarify variable names in define-macro expansion.
Fix indentation of define-macro.