Some progress for #167
-OnPlayerDeath is behind (probably because we're using the Pre hook) and Spawn probably is too