Fix over-enthusiastic ns cleanup.