Rename macro vals before resetting symbols.

Fixes #3 #44