Patch Set 1: I would prefer that you didn't submit this

Oops, sorry to bother again: the IImportStructureProvider member of the outer class is always null and should be removed (along with the method parameter in the inner class and the corresponding logic).