Simplify gstate_c savestate code a bit.

So it's not as awkward to modify.