Merge "Remove the obsolete ScriptCState.  Simplify cascading #ifdefs."