fixup! Delay signalling of enabled state changes until the op batch is complete