Small cleanup to GameHandler.