Clean-up changes after first tranche of void-safe changes.