I think that was more than a chip - I had forgotten about the distinction between the core and 'hidden' buildings. But remind me again why it didn't happen in vanilla...

I can share the FATW method (we've never had any city-revolt CTDs since employing it some time ago), but it's a bit complex ;)