Done.  I could probably get away with not doing the savestate changes now, but we might change gstate_c more later anyway...

-[Unknown]