More work on map save/restore.