Merge the destroy order fix into Main. Everything seems to be working OK. I did find remaining a nasty bug where things don't get cleaned up properly when the player quits a game, but it turns out that's actually been a bug for a while. I'll fix that next.