Some edge cases showed up in our more detailed TopCPToolkit tests, this MR should make the whole thing robust again after !71283 (merged)