Consolidate savestate keys and make them look more natural.

Last pullrq, promise.