Yes.
Sure. I'll remove the support I added for ignoring struct and interfaces in the DiscoverTemplateTypes as well.