Don't merge--issue #4689: Refactoring game controller API.