#1261: Move around some saving logic.