Make quoting arguments to Save and Restore command optional