This was particularly nasty with the shorthand macros 'gState' and 'glState'. The former is now 'shState'.