fixes #48
fixes #46
being extra careful with duplications
annotation expansion now respects macrosDisabled
updates the part of namers copy/pasted into paradise to be in sync with recent changes in trunk
adapts repl tests to changes in repl