Some refactoring for Escort gametype.