Handle re-definition of plugins more gracefully, in the (common) case that...

Handle re-definition of plugins more gracefully, in the (common) case that both defining .pluginmaps place the plugin in the menu.
- Do not add duplicate entries
- Delay resolution of the menu label until the best version of the plugin is known
Also make the internal representation of the menu more readable by using proper classes.