using resolve instead of unwrapSyntax #229

Under normal flow through enforest unwrapSyntax vs resolve doesn’t
matter since macros that might shadow the primitive keywords are
already expanded. But it does matter when stepping through macro
expansion.