The macro expansion is now recursing into forms properly