Updated with the pull-request version of the macro expansion.
Updated for refinements to the macroexpansion.