Renamed save/restore macros.