savegame: minor refactoring