Merged Michael's refactoring efforts for game type code.