Fix up reporting for desires that have no matching features - I had

borken the code that helps assign figure out which desire was not
matched.

Also remove some old dead code while I'm in here.