Comment 18 for bug 1843415

I changed my mind and just fixed all of the issues that I could find except for schematics that already a broken by the recursion loop issue. That has to be fixed in the schematic plugin so it's not as straight forward as preventing the issue in the first place. Please let me know if you find any issues.