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

...on pane.

See https://bugzilla.mozilla.org/show_bug.cgi?id=956855
Ah, I forgot about that. Okay, looks good. Let's add a comment describing why we're doing this strange thing and then merge it in. :-)