Fix variables defined in macros appearing multiple times in the Navigati...

...on pane.

See https://bugzilla.mozilla.org/show_bug.cgi?id=956855