Correct the macro expansion assertion to number GENSYMS from 1.

Improve the comparison of the expanded forms.