More cleanup, environment deaths are broken

they take too long to resolve, and the game ends before they are
recorded