refactor save_state code

the save_state code uses multiple assignments. this isn't safe as
it assigns both values to same target. also, it doesn't seem like
the local var is ever used.

Change-Id: I5c93433b34dea6ee0e4ee8d5466a801f1599c8c3
1 file changed