Bah. The Moz bug has been scheduled as ‘Future’ (i.e. we’ll fix it when we’ve got through all the numbered releases that we’re currently planning). I can’t entirely blame them, since the XUL template code is about 24,000 lines of C++ with little commenting. If there was some documentation on the algorithm that they’re using for matching and conflict resolution, I’d be very tempted to have a go at fixing it myself, but as it stands I can’t justify the investment of my time to piece through the intricacies of the code.