Take non-UI bits out of death.c, rename