annotations macros now expand in repl

that was a combo of two bugs, which I don't have time to fix now, so
I put workaround in place for both of them.

this doesn't fix the problem of repl not seeing definitions introduced
by macro annotations. that one is going to be real tricky