Break the spawnd kill API into kill + cleanup.