Fix over/under zealous cleanup.