Tweaks to save/restore macros.